fix: cmakelist for install (#337)

aneoconsulting · Jul 11, 2023 · f146d04 · f146d04
2 parents 0971203 + b5bfd09
commit f146d04
Show file tree

Hide file tree

Showing 13 changed files with 559 additions and 585 deletions.
diff --git a/packages/cpp/ArmoniK.Api.Client/CMakeLists.txt b/packages/cpp/ArmoniK.Api.Client/CMakeLists.txt
@@ -1,139 +1,124 @@
-set(PROJECT_NAME ArmoniK.Api.Client)
-set(NAMESPACE ArmoniK::Api::Client)
-set(version 0.1.0)
-
-set(PROTO_FILES 
-    "submitter_service.proto"
-    "applications_service.proto"
-    "sessions_service.proto"
-    # "tasks_service.proto" Name conflict with grpc generated files ListTasks and ListTasksRaw (grpc add the suffix RAW to all interfaces)
-    "results_service.proto"
-    "auth_service.proto"
-    "partitions_service.proto"
-    "events_service.proto"
-    "versions_service.proto"
-    "auth_common.proto"
-    "sessions_common.proto"
-    "submitter_common.proto"
-    "tasks_common.proto"
-    "results_common.proto"
-    "partitions_common.proto"
-    "events_common.proto"
-    "versions_common.proto"
-    "applications_common.proto")
-
-set(PROTO_DEPS
-    "session_status.proto"
-    "sort_direction.proto"
-    "objects.proto"
-    "result_status.proto"
-    "task_status.proto")
-
-foreach(file ${PROTO_FILES} ${PROTO_DEPS})
-    configure_file("${PROTO_FILES_DIR}/${file}" "${BUILD_DIR}/${PROJECT_NAME}/${file}" COPYONLY)
-endforeach()
-list(TRANSFORM PROTO_FILES PREPEND ${BUILD_DIR}/${PROJECT_NAME}/)
-
-find_package(Protobuf REQUIRED)
-find_package(gRPC CONFIG REQUIRED)
-find_package(Threads)
-
-SET(SOURCES_FILES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/source")
-SET(HEADER_FILES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/header")
-
-FILE(GLOB_RECURSE SRC_CLIENT_FILES ${SOURCES_FILES_DIR}/*.cpp)
-FILE(GLOB_RECURSE HEADER_CLIENT_FILES ${HEADER_FILES_DIR}/*.h)
-
-
-file(MAKE_DIRECTORY ${BUILD_DIR}/${PROJECT_NAME})
-
-add_library(${PROJECT_NAME} STATIC ${PROTO_FILES} ${SRC_CLIENT_FILES} ${HEADER_CLIENT_FILES})
-
-target_link_libraries(${PROJECT_NAME} PUBLIC protobuf::libprotobuf gRPC::grpc++_unsecure ArmoniK.Api.Common)
-
-target_include_directories(${PROJECT_NAME}
-                           PUBLIC
-                           "$<BUILD_INTERFACE:${HEADER_FILES_DIR}>"
-                           "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
-)
-
-set(PROTO_BINARY_DIR "${BUILD_DIR}/${PROJECT_NAME}/")
-set(PROTO_IMPORT_DIRS "${PROTO_FILES_DIR}")
-
-protobuf_generate(
-    TARGET ${PROJECT_NAME}
+set(PROJECT_NAME ArmoniK.Api.Client)
+set(NAMESPACE ArmoniK::Api::Client)
+set(version 0.1.0)
+set(ARMONIK_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR}/armonik/client)
+set(PROJECT_BUILD_DIR ${BUILD_DIR}/${PROJECT_NAME})
+
+set(PROTO_FILES 
+    "submitter_service.proto"
+    "applications_service.proto"
+    "sessions_service.proto"
+    #"tasks_service.proto" Name conflict with grpc generated files ListTasks and ListTasksRaw (grpc add the suffix RAW to all interfaces)
+    "results_service.proto"
+    "auth_service.proto"
+    "partitions_service.proto"
+    "events_service.proto"
+    "versions_service.proto")
+
+set(PROTO_MESSAGES 
+    "auth_common.proto"
+    "sessions_common.proto"
+    "submitter_common.proto"
+    "tasks_common.proto"
+    "results_common.proto"
+    "partitions_common.proto"
+    "events_common.proto"
+    "versions_common.proto"
+    "applications_common.proto")
+
+list(TRANSFORM PROTO_FILES PREPEND "${PROTO_FILES_DIR}/")
+list(TRANSFORM PROTO_MESSAGES PREPEND "${PROTO_FILES_DIR}/")
+
+find_package(Protobuf REQUIRED)
+find_package(gRPC CONFIG REQUIRED)
+find_package(Threads)
+
+SET(SOURCES_FILES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/source")
+SET(HEADER_FILES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/header")
+
+FILE(GLOB_RECURSE SRC_CLIENT_FILES ${SOURCES_FILES_DIR}/*.cpp)
+FILE(GLOB_RECURSE HEADER_CLIENT_FILES ${HEADER_FILES_DIR}/*.h)
+
+
+file(MAKE_DIRECTORY ${PROJECT_BUILD_DIR})
+
+set(PROTO_BINARY_DIR "${PROJECT_BUILD_DIR}")
+set(PROTO_IMPORT_DIRS "${PROTO_FILES_DIR}")
+
+add_library(${PROJECT_NAME} STATIC ${PROTO_GENERATED_FILES} ${SRC_CLIENT_FILES} ${HEADER_CLIENT_FILES})
+
+protobuf_generate(
+    TARGET ${PROJECT_NAME}
+    PROTOS ${PROTO_MESSAGES} ${PROTO_FILES}
+    OUT_VAR PROTO_GENERATED_MESSAGES
+    APPEND_PATH "./"
+    IMPORT_DIRS ${PROTO_IMPORT_DIRS}
+    PROTOC_OUT_DIR "${PROTO_BINARY_DIR}")
+set_source_files_properties(${PROTO_GENERATED_MESSAGES} PROPERTIES SKIP_UNITY_BUILD_INCLUSION on)
+
+get_target_property(grpc_cpp_plugin_location gRPC::grpc_cpp_plugin LOCATION)
+
+protobuf_generate(
+    TARGET ${PROJECT_NAME}
     OUT_VAR PROTO_GENERATED_FILES
-    APPEND_PATH "./"
-    IMPORT_DIRS ${BUILD_DIR}/${PROJECT_NAME}
-    PROTOC_OUT_DIR "${PROTO_BINARY_DIR}")
-set_source_files_properties(${PROTO_GENERATED_FILES} PROPERTIES SKIP_UNITY_BUILD_INCLUSION on)
-
-get_target_property(grpc_cpp_plugin_location gRPC::grpc_cpp_plugin LOCATION)
-
-protobuf_generate(
-    TARGET ${PROJECT_NAME}
-    OUT_VAR PROTO_GENERATED_FILES
-    APPEND_PATH "./"
-    LANGUAGE grpc
-    GENERATE_EXTENSIONS .grpc.pb.h .grpc.pb.cc
-    PLUGIN "protoc-gen-grpc=${grpc_cpp_plugin_location}"
-    # PLUGIN_OPTIONS "generate_mock_code=true"
-    IMPORT_DIRS ${BUILD_DIR}/${PROJECT_NAME}
-    PROTOC_OUT_DIR "${PROTO_BINARY_DIR}")
-
-set_source_files_properties(${PROTO_GENERATED_FILES} PROPERTIES SKIP_UNITY_BUILD_INCLUSION on)
-
-target_include_directories(${PROJECT_NAME}
-                           PUBLIC
-                           "$<BUILD_INTERFACE:${PROTO_BINARY_DIR}>"
-                           "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
-
-target_include_directories(${PROJECT_NAME}
-                            PUBLIC
-                            "$<BUILD_INTERFACE:${PROTO_BINARY_DIR}>"
-                            "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
-
-
-
-
-set_property(TARGET ${PROJECT_NAME} PROPERTY VERSION ${version})
-set_property(TARGET ${PROJECT_NAME} PROPERTY SOVERSION 0)
-set_property(TARGET ${PROJECT_NAME} PROPERTY
-    INTERFACE_${PROJECT_NAME}_MAJOR_VERSION 0)
-set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY
-    COMPATIBLE_INTERFACE_STRING ${PROJECT_NAME}_MAJOR_VERSION
-)
-
-# generate the version file for the config file
-write_basic_package_version_file(
-    "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
-    VERSION "${version}"
-    COMPATIBILITY AnyNewerVersion
-)
-
-install(TARGETS ${PROJECT_NAME}
-        EXPORT ${PROJECT_NAME}Targets
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-        INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-        )
-
-FILE(GLOB INCLUDE_FILES ${PROTO_BINARY_DIR}/*.h)
-install(FILES ${INCLUDE_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-
-install(EXPORT ${PROJECT_NAME}Targets
-        FILE ${PROJECT_NAME}Targets.cmake
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-)
-
-configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
-  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
-  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-)
-
-install(FILES
-          "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
-          "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-)
+    PROTOS ${PROTO_FILES}
+    APPEND_PATH "./"
+    LANGUAGE grpc
+    GENERATE_EXTENSIONS .grpc.pb.h .grpc.pb.cc
+    PLUGIN "protoc-gen-grpc=${grpc_cpp_plugin_location}"
+    # PLUGIN_OPTIONS "generate_mock_code=true"
+    IMPORT_DIRS ${PROTO_IMPORT_DIRS}
+    PROTOC_OUT_DIR "${PROTO_BINARY_DIR}")
+
+set_source_files_properties(${PROTO_GENERATED_FILES} PROPERTIES SKIP_UNITY_BUILD_INCLUSION on)
+list(APPEND PROTO_GENERATED_FILES ${PROTO_GENERATED_MESSAGES})
+
+target_link_libraries(${PROJECT_NAME} PUBLIC protobuf::libprotobuf gRPC::grpc++_unsecure ArmoniK.Api.Common)
+
+target_include_directories(${PROJECT_NAME}
+                           PUBLIC
+                           "$<BUILD_INTERFACE:${PROJECT_BUILD_DIR}>"
+                           "$<BUILD_INTERFACE:${HEADER_FILES_DIR}>"
+                           "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+)
+
+set_property(TARGET ${PROJECT_NAME} PROPERTY VERSION ${version})
+set_property(TARGET ${PROJECT_NAME} PROPERTY SOVERSION 0)
+set_property(TARGET ${PROJECT_NAME} PROPERTY
+    INTERFACE_${PROJECT_NAME}_MAJOR_VERSION 0)
+set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY
+    COMPATIBLE_INTERFACE_STRING ${PROJECT_NAME}_MAJOR_VERSION
+)
+
+# generate the version file for the config file
+write_basic_package_version_file(
+    "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
+    VERSION "${version}"
+    COMPATIBILITY AnyNewerVersion
+)
+
+install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets)
+set(PROTO_GENERATED_HEADERS ${PROTO_GENERATED_FILES})
+
+list(FILTER PROTO_GENERATED_HEADERS INCLUDE REGEX .*\.h )
+
+install(FILES ${PROTO_GENERATED_HEADERS} DESTINATION ${ARMONIK_INSTALL_INCLUDE_DIR})
+install(FILES ${HEADER_CLIENT_FILES} DESTINATION ${ARMONIK_INSTALL_INCLUDE_DIR})
+
+install(EXPORT ${PROJECT_NAME}Targets
+        FILE ${PROJECT_NAME}Targets.cmake
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+
+)
+
+configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
+  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+  PATH_VARS CMAKE_INSTALL_PREFIX
+)
+
+install(FILES
+          "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+          "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+)
diff --git a/packages/cpp/ArmoniK.Api.Client/Config.cmake.in b/packages/cpp/ArmoniK.Api.Client/Config.cmake.in
@@ -1,5 +1,9 @@
-@PACKAGE_INIT@
-
-include("${CMAKE_INSTALL_PREFIX}/lib/cmake/Armonik.Api.Client/Armonik.Api.ClientTargets.cmake")
-
-check_required_components(Armonik.Api.Client)
+@PACKAGE_INIT@
+
+set_and_check(ARMONIK_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@")
+
+include("${ARMONIK_INSTALL_PREFIX}/lib/cmake/Armonik.Api.Client/Armonik.Api.ClientTargets.cmake")
+
+check_required_components(Armonik.Api.Client)
+
+include_directories("${ARMONIK_INSTALL_PREFIX}/include/armonik/client")
diff --git a/packages/cpp/ArmoniK.Api.Client/source/submitter/SubmitterClient.cpp b/packages/cpp/ArmoniK.Api.Client/source/submitter/SubmitterClient.cpp
@@ -8,7 +8,7 @@
 #include <sstream>
 #include <string>
 
-#include "objects.grpc.pb.h"
+#include "objects.pb.h"
 #include "submitter_common.pb.h"
 #include "submitter_service.grpc.pb.h"