This is an automated email from the ASF dual-hosted git repository. fgerlits pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 12e17872e44ffa01042760f4805daf3a9ef6da91 Author: Marton Szasz <[email protected]> AuthorDate: Fri Aug 11 05:35:59 2023 +0200 MINIFICPP-2180 Package generation should avoid including test_processors Signed-off-by: Ferenc Gerlits <[email protected]> This closes #1628 --- cmake/DockerConfig.cmake | 3 ++- cmake/Extensions.cmake | 30 ++++++++++++++++++------------ cmake/MiNiFiOptions.cmake | 2 +- extensions/test-processors/CMakeLists.txt | 2 +- 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/cmake/DockerConfig.cmake b/cmake/DockerConfig.cmake index 1e9347c2d..b2ab19eca 100644 --- a/cmake/DockerConfig.cmake +++ b/cmake/DockerConfig.cmake @@ -56,7 +56,8 @@ add_custom_target( -DENABLE_LUA_SCRIPTING=OFF -DENABLE_PYTHON_SCRIPTING=OFF -DENABLE_OPC=OFF - -DENABLE_ENCRYPT_CONFIG=OFF \" + -DENABLE_ENCRYPT_CONFIG=OFF + -DCI_BUILD=${CI_BUILD}\" -c DOCKER_BASE_IMAGE=${DOCKER_BASE_IMAGE} -c DOCKER_SKIP_TESTS=${DOCKER_SKIP_TESTS} -c BUILD_NUMBER=${BUILD_NUMBER} diff --git a/cmake/Extensions.cmake b/cmake/Extensions.cmake index d02f2883a..176b08f97 100644 --- a/cmake/Extensions.cmake +++ b/cmake/Extensions.cmake @@ -60,26 +60,32 @@ macro(register_extension extension-name extension-display-name extension-guard d set_target_properties(${extension-name} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") endif() - get_component_name(${extension-name} component-name) + if (${ARGC} GREATER 5) + set(ARG_FLAGS ${ARGV5}) + endif() - if(WIN32) - install(TARGETS ${extension-name} RUNTIME DESTINATION extensions COMPONENT ${component-name}) - else() - if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - target_link_options(${extension-name} PRIVATE "-Wl,--disable-new-dtags") - endif() - if (APPLE) - set_target_properties(${extension-name} PROPERTIES INSTALL_RPATH "@loader_path") + if (NOT "CI_ONLY_INSTALL" IN_LIST ARG_FLAGS OR CI_BUILD) + get_component_name(${extension-name} component-name) + + if(WIN32) + install(TARGETS ${extension-name} RUNTIME DESTINATION extensions COMPONENT ${component-name}) else() - set_target_properties(${extension-name} PROPERTIES INSTALL_RPATH "$ORIGIN") + if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + target_link_options(${extension-name} PRIVATE "-Wl,--disable-new-dtags") + endif() + if (APPLE) + set_target_properties(${extension-name} PROPERTIES INSTALL_RPATH "@loader_path") + else() + set_target_properties(${extension-name} PROPERTIES INSTALL_RPATH "$ORIGIN") + endif() + install(TARGETS ${extension-name} LIBRARY DESTINATION extensions COMPONENT ${component-name}) endif() - install(TARGETS ${extension-name} LIBRARY DESTINATION extensions COMPONENT ${component-name}) endif() ADD_FEATURE_INFO("${extension-display-name}" ${extension-guard} "${description}") mark_as_advanced(${extension-guard}) # check for test directory - if(${ARGC} GREATER 4) + if(${ARGC} GREATER 4 AND NOT "${ARGV4}" STREQUAL "") register_extension_test(${ARGV4}) endif() endmacro() diff --git a/cmake/MiNiFiOptions.cmake b/cmake/MiNiFiOptions.cmake index 21c35435c..c20e7b9b7 100644 --- a/cmake/MiNiFiOptions.cmake +++ b/cmake/MiNiFiOptions.cmake @@ -136,7 +136,7 @@ endif() function(get_minifi_docker_options RET_VALUE) set(MINIFI_DOCKER_OPTIONS_STR ${MINIFI_EXTERNAL_DOCKER_OPTIONS_STR}) foreach(MINIFI_OPTION ${MINIFI_OPTIONS}) - if (MINIFI_OPTION STREQUAL "CI_BUILD" OR MINIFI_OPTION STREQUAL "SKIP_TESTS" OR MINIFI_OPTION STREQUAL "DOCKER_BUILD_ONLY" OR MINIFI_OPTION STREQUAL "DOCKER_SKIP_TESTS" OR MINIFI_OPTION STREQUAL "DOCKER_PUSH") + if (MINIFI_OPTION STREQUAL "SKIP_TESTS" OR MINIFI_OPTION STREQUAL "DOCKER_BUILD_ONLY" OR MINIFI_OPTION STREQUAL "DOCKER_SKIP_TESTS" OR MINIFI_OPTION STREQUAL "DOCKER_PUSH") continue() endif() set(MINIFI_DOCKER_OPTIONS_STR "${MINIFI_DOCKER_OPTIONS_STR} -D${MINIFI_OPTION}=${${MINIFI_OPTION}}") diff --git a/extensions/test-processors/CMakeLists.txt b/extensions/test-processors/CMakeLists.txt index 844147bd2..13beb0d78 100644 --- a/extensions/test-processors/CMakeLists.txt +++ b/extensions/test-processors/CMakeLists.txt @@ -29,6 +29,6 @@ add_library(minifi-test-processors SHARED ${SOURCES}) target_link_libraries(minifi-test-processors ${LIBMINIFI}) -register_extension(minifi-test-processors "TEST-PROCESSORS EXTENSION" TEST-PROCESSORS-EXTENSION "This enables processors purely for testing purposes") +register_extension(minifi-test-processors "TEST-PROCESSORS EXTENSION" TEST-PROCESSORS-EXTENSION "This enables processors purely for testing purposes" "" "CI_ONLY_INSTALL") register_extension_linter(minifi-test-processors-extensions-linter)
