This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch feature/remove_cmake_in_list_usage in repository https://gitbox.apache.org/repos/asf/celix.git
commit 22917b45e2e38bd310f1c9fa9a62906195535539 Author: Pepijn Noltes <[email protected]> AuthorDate: Sun Jun 7 20:43:04 2020 +0200 Removes usage of cmake IF(IN_LIST), for some env this gives problems. --- cmake/cmake_celix/BundlePackaging.cmake | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/cmake/cmake_celix/BundlePackaging.cmake b/cmake/cmake_celix/BundlePackaging.cmake index f765ad3..3081b5d 100644 --- a/cmake/cmake_celix/BundlePackaging.cmake +++ b/cmake/cmake_celix/BundlePackaging.cmake @@ -195,15 +195,20 @@ function(add_celix_bundle) endif () if (NOT DEFINED BUNDLE_FILENAME) - set(BUNDLE_FILENAME ${BUNDLE_TARGET_NAME}) - endif () - - if (${CMAKE_BUILD_TYPE} IN_LIST CELIX_NO_POSTFIX_BUILD_TYPES) - set(BUNDLE_FILENAME ${BUNDLE_FILENAME}.zip) + set(BASE_BUNDLE_FILENAME ${BUNDLE_TARGET_NAME}) else () - set(BUNDLE_FILENAME ${BUNDLE_FILENAME}-${CMAKE_BUILD_TYPE}.zip) + set(BASE_BUNDLE_FILENAME ${BUNDLE_FILENAME}) endif () + + set(BUNDLE_FILENAME ${BASE_BUNDLE_FILENAME}-${CMAKE_BUILD_TYPE}.zip) + foreach (NO_POSTFIX_BT IN LISTS CELIX_NO_POSTFIX_BUILD_TYPES) + if (CMAKE_BUILD_TYPE STREQUAL NO_POSTFIX_BT) + #setting bundle file name without postfix + set(BUNDLE_FILENAME ${BASE_BUNDLE_FILENAME}.zip) + endif () + endforeach () + set(BUNDLE_FILE "${CMAKE_CURRENT_BINARY_DIR}/${BUNDLE_FILENAME}") #set(BUNDLE_CONTENT_DIR "${CMAKE_CURRENT_BINARY_DIR}/${BUNDLE_TARGET_NAME}_content") #set(BUNDLE_GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}/${BUNDLE_TARGET_NAME}_gen")
