From f2a753e1bd92cb29a5ba3e38f2b31fd9fd598ecd Mon Sep 17 00:00:00 2001 From: Dennis Klein Date: Tue, 17 Apr 2018 20:23:33 +0200 Subject: [PATCH] Support package components and drop transitive dependency discovery --- CMakeLists.txt | 49 +++++++++++++++++++++++---- cmake/FairMQConfig.cmake.in | 4 +-- cmake/FairMQLib.cmake | 67 ++++++++++++++++++------------------- fairmq/Version.h.in | 4 +-- 4 files changed, 78 insertions(+), 46 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 57ac8638..329a5b00 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,18 +73,53 @@ endif() ################################################################################ +# Package components ########################################################### +list(APPEND PROJECT_PACKAGE_COMPONENTS fairmq) +list(APPEND PROJECT_PACKAGE_COMPONENTS tests) +if(BUILD_DDS_PLUGIN) + list(APPEND PROJECT_PACKAGE_COMPONENTS dds_plugin) +endif() +if(BUILD_NANOMSG_TRANSPORT) + list(APPEND PROJECT_PACKAGE_COMPONENTS nanomsg_transport) +endif() +if(BUILD_OFI_TRANSPORT) + list(APPEND PROJECT_PACKAGE_COMPONENTS ofi_transport) +endif() +################################################################################ + + # Installation ################################################################# install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME_LOWER}/Version.h DESTINATION ${PROJECT_INSTALL_INCDIR} ) +# Install cmake modules +install(FILES cmake/FindZeroMQ.cmake + DESTINATION ${PROJECT_INSTALL_CMAKEMODDIR} +) +if(BUILD_DDS_PLUGIN) + install(FILES cmake/FindDDS.cmake + DESTINATION ${PROJECT_INSTALL_CMAKEMODDIR} + ) +endif() +if(BUILD_NANOMSG_TRANSPORT) + install(FILES cmake/Findnanomsg.cmake + DESTINATION ${PROJECT_INSTALL_CMAKEMODDIR} + ) +endif() +if(BUILD_OFI_TRANSPORT) + install(FILES cmake/FindOFI.cmake + DESTINATION ${PROJECT_INSTALL_CMAKEMODDIR} + ) +endif() + install_cmake_package() ################################################################################ # Summary ###################################################################### message(STATUS " ") -message(STATUS " ${Cyan}DEPENDENCY VERSION PREFIX${CR}") +message(STATUS " ${Cyan}DEPENDENCY VERSION ${CR}") foreach(dep IN LISTS PROJECT_PACKAGE_DEPENDENCIES) if(${dep}_VERSION) if(${dep} STREQUAL Boost) @@ -100,35 +135,35 @@ foreach(dep IN LISTS PROJECT_PACKAGE_DEPENDENCIES) endif() pad(${dep} 15 " " dep_padded) pad("${version_str}${version_req_str}" 20 " " version_padded) - message(STATUS " ${BWhite}${dep_padded}${CR}${version_padded}...") + message(STATUS " ${BWhite}${dep_padded}${CR}${version_padded}") unset(version_str) endforeach() message(STATUS " ") message(STATUS " ${Cyan}COMPONENT BUILT? INFO${CR}") -message(STATUS " ${BWhite}FairMQ${CR} ${BGreen}YES${CR} (default, always built)") +message(STATUS " ${BWhite}fairmq${CR} ${BGreen}YES${CR} (default, always built)") if(BUILD_TESTING) set(tests_summary "${BGreen}YES${CR} (default, disable with ${BMagenta}-DBUILD_TESTING=OFF${CR})") else() set(tests_summary "${BRed} NO${CR} (enable with ${BMagenta}-DBUILD_TESTING=ON${CR})") endif() -message(STATUS " ${BWhite}test${CR} ${tests_summary}") +message(STATUS " ${BWhite}tests${CR} ${tests_summary}") if(BUILD_NANOMSG_TRANSPORT) set(nn_summary "${BGreen}YES${CR} (disable with ${BMagenta}-DBUILD_NANOMSG_TRANSPORT=OFF${CR})") else() set(nn_summary "${BRed} NO${CR} (default, enable with ${BMagenta}-DBUILD_NANOMSG_TRANSPORT=ON${CR})") endif() -message(STATUS " ${BWhite}NanomsgTransport${CR} ${nn_summary}") +message(STATUS " ${BWhite}nanomsg_transport${CR} ${nn_summary}") if(BUILD_OFI_TRANSPORT) set(ofi_summary "${BGreen}YES${CR} EXPERIMENTAL (disable with ${BMagenta}-DBUILD_OFI_TRANSPORT=OFF${CR})") else() set(ofi_summary "${BRed} NO${CR} EXPERIMENTAL (default, enable with ${BMagenta}-DBUILD_OFI_TRANSPORT=ON${CR})") endif() -message(STATUS " ${BWhite}OfiTransport${CR} ${ofi_summary}") +message(STATUS " ${BWhite}ofi_transport${CR} ${ofi_summary}") if(BUILD_DDS_PLUGIN) set(dds_summary "${BGreen}YES${CR} (disable with ${BMagenta}-DBUILD_DDS_PLUGIN=OFF${CR})") else() set(dds_summary "${BRed} NO${CR} (default, enable with ${BMagenta}-DBUILD_DDS_PLUGIN=ON${CR})") endif() -message(STATUS " ${BWhite}FairMQPlugin_dds${CR} ${dds_summary}") +message(STATUS " ${BWhite}dds_plugin${CR} ${dds_summary}") message(STATUS " ") ################################################################################ diff --git a/cmake/FairMQConfig.cmake.in b/cmake/FairMQConfig.cmake.in index f8e895ee..da977782 100644 --- a/cmake/FairMQConfig.cmake.in +++ b/cmake/FairMQConfig.cmake.in @@ -28,11 +28,11 @@ set(CMAKE_MODULE_PATH ${@PROJECT_NAME@_CMAKEMODDIR} ${CMAKE_MODULE_PATH}) @PACKAGE_DEPENDENCIES@ ### Import targets -include(@PACKAGE_CMAKE_INSTALL_PREFIX@/@PACKAGE_INSTALL_DESTINATION@/@PROJECT_NAME@Targets.cmake) +include(@PACKAGE_CMAKE_INSTALL_PREFIX@/@PACKAGE_INSTALL_DESTINATION@/@PROJECT_EXPORT_SET@.cmake) ### Alias target for backwards compat (DEPRECATED) if(NOT TARGET FairRoot::@PROJECT_NAME@) add_library(FairRoot::@PROJECT_NAME@ ALIAS @PROJECT_NAME@::@PROJECT_NAME@) endif() -check_required_components(@PROJECT_NAME@) +@PACKAGE_COMPONENTS@ diff --git a/cmake/FairMQLib.cmake b/cmake/FairMQLib.cmake index 201d19e2..c97dd624 100644 --- a/cmake/FairMQLib.cmake +++ b/cmake/FairMQLib.cmake @@ -121,6 +121,9 @@ macro(set_fairmq_defaults) set(CMAKE_CXX_EXTENSIONS OFF) endif() + # Set -fpic as default for all library types + set(CMAKE_POSITION_INDEPENDENT_CODE ON) + # Generate compile_commands.json file (https://clang.llvm.org/docs/JSONCompilationDatabase.html) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) @@ -159,59 +162,52 @@ function(generate_package_dependencies) join("${PROJECT_INTERFACE_PACKAGE_DEPENDENCIES}" " " DEPS) set(PACKAGE_DEPENDENCIES "\ ####### Expanded from @PACKAGE_DEPENDENCIES@ by configure_package_config_file() ####### -####### Any changes to this file will be overwritten by the next CMake run ############ - -include(CMakeFindDependencyMacro) set(${PROJECT_NAME}_PACKAGE_DEPENDENCIES ${DEPS}) ") foreach(dep IN LISTS PROJECT_INTERFACE_PACKAGE_DEPENDENCIES) join("${PROJECT_INTERFACE_${dep}_COMPONENTS}" " " COMPS) - if(${dep}_FOUND) - message(>>>> ${dep} ${${dep}_FOUND}) - endif() - string(CONCAT PACKAGE_DEPENDENCIES ${PACKAGE_DEPENDENCIES} "\ + if(COMPS) + string(CONCAT PACKAGE_DEPENDENCIES ${PACKAGE_DEPENDENCIES} "\ set(${PROJECT_NAME}_${dep}_COMPONENTS ${COMPS}) -set(${PROJECT_NAME}_${dep}_VERSION ${PROJECT_INTERFACE_${dep}_VERSION}) -set(${PROJECT_NAME}_${dep}_FOUND ${${dep}_FOUND}) - ") + endif() + if(PROJECT_INTERFACE_${dep}_VERSION) + string(CONCAT PACKAGE_DEPENDENCIES ${PACKAGE_DEPENDENCIES} "\ +set(${PROJECT_NAME}_${dep}_VERSION ${PROJECT_INTERFACE_${dep}_VERSION}) +") + endif() endforeach() string(CONCAT PACKAGE_DEPENDENCIES ${PACKAGE_DEPENDENCIES} "\ -if(Boost_INCLUDE_DIR) # checks for cached boost variable which indicates if Boost is already found - set(${PROJECT_NAME}_Boost_QUIET QUIET) -endif() - -foreach(dep IN LISTS ${PROJECT_NAME}_PACKAGE_DEPENDENCIES) - if( NOT (${PROJECT_NAME}_\${dep}_DISABLED OR ${PROJECT_NAME}_PACKAGE_DEPENDENCIES_DISABLED) - AND (${PROJECT_NAME}_\${dep}_FOUND OR ${PROJECT_NAME}_\${dep}_REQUIRED)) - if(${PROJECT_NAME}_ADDITIONAL_\${dep}_COMPONENTS) - list(APPEND ${PROJECT_NAME}_\${dep}_COMPONENTS \${${PROJECT_NAME}_ADDITIONAL_\${dep}_COMPONENTS}) - list(REMOVE_DUPLICATES ${PROJECT_NAME}_\${dep}_COMPONENTS) - endif() - if(${PROJECT_NAME}_\${dep}_COMPONENTS) - set(components COMPONENTS \${${PROJECT_NAME}_\${dep}_COMPONENTS}) - else() - set(components) - endif() - find_dependency(\${dep} \${${PROJECT_NAME}_\${dep}_VERSION} \${${PROJECT_NAME}_\${dep}_QUIET} \${components}) - endif() -endforeach() ####################################################################################### ") set(PACKAGE_DEPENDENCIES ${PACKAGE_DEPENDENCIES} PARENT_SCOPE) endfunction() +function(generate_package_components) + join("${PROJECT_PACKAGE_COMPONENTS}" " " COMPS) + set(PACKAGE_COMPONENTS "\ +####### Expanded from @PACKAGE_COMPONENTS@ by configure_package_config_file() ######### + +set(${PROJECT_NAME}_PACKAGE_COMPONENTS ${COMPS}) + +") + foreach(comp IN LISTS PROJECT_PACKAGE_COMPONENTS) + string(CONCAT PACKAGE_COMPONENTS ${PACKAGE_COMPONENTS} "\ +set(${PROJECT_NAME}_${comp}_FOUND TRUE) +") + endforeach() + string(CONCAT PACKAGE_COMPONENTS ${PACKAGE_COMPONENTS} "\ + +check_required_components(${PROJECT_NAME}) +") +set(PACKAGE_COMPONENTS ${PACKAGE_COMPONENTS} PARENT_SCOPE) +endfunction() + # Configure/Install CMake package macro(install_cmake_package) - # Install cmake modules - install(DIRECTORY cmake - DESTINATION ${PROJECT_INSTALL_CMAKEMODDIR} - PATTERN "cmake/Find*.cmake" - ) - include(CMakePackageConfigHelpers) set(PACKAGE_INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${PROJECT_VERSION} @@ -227,6 +223,7 @@ macro(install_cmake_package) COMPATIBILITY AnyNewerVersion ) generate_package_dependencies() # fills ${PACKAGE_DEPENDENCIES} + generate_package_components() # fills ${PACKAGE_COMPONENTS} configure_package_config_file( ${CMAKE_SOURCE_DIR}/cmake/${PROJECT_NAME}Config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake diff --git a/fairmq/Version.h.in b/fairmq/Version.h.in index 6e493e98..17c2e458 100644 --- a/fairmq/Version.h.in +++ b/fairmq/Version.h.in @@ -13,7 +13,7 @@ #define FAIRMQ_VERSION_MAJOR @PROJECT_VERSION_MAJOR@ #define FAIRMQ_VERSION_MINOR @PROJECT_VERSION_MINOR@ #define FAIRMQ_VERSION_PATCH @PROJECT_VERSION_PATCH@ -#define FAIRMQ_GIT_VERSION "@FairMQ_GIT_VERSION@" -#define FAIRMQ_GIT_DATE "@FairMQ_GIT_DATE@" +#define FAIRMQ_GIT_VERSION "@PROJECT_GIT_VERSION@" +#define FAIRMQ_GIT_DATE "@PROJECT_GIT_DATE@" #endif // FAIR_MQ_VERSION_H