You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by ab...@apache.org on 2020/06/02 08:50:25 UTC
[celix] 01/01: Updated NO_POSTFIX_BUILD_TYPES to a list to be able
to specify RelWithDebInfo and Release
This is an automated email from the ASF dual-hosted git repository.
abroekhuis pushed a commit to branch feature/no_postfix_list
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 24eeafa4c91a64777313c6a2055bbf0b954d0498
Author: Alexander Broekhuis <al...@luminis.eu>
AuthorDate: Tue Jun 2 10:50:06 2020 +0200
Updated NO_POSTFIX_BUILD_TYPES to a list to be able to specify RelWithDebInfo and Release
---
cmake/cmake_celix/BundlePackaging.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake/cmake_celix/BundlePackaging.cmake b/cmake/cmake_celix/BundlePackaging.cmake
index 91db057..f765ad3 100644
--- a/cmake/cmake_celix/BundlePackaging.cmake
+++ b/cmake/cmake_celix/BundlePackaging.cmake
@@ -17,7 +17,7 @@
# under the License.
-set(CELIX_NO_POSTFIX_BUILD_TYPE "RelWithDebInfo" CACHE STRING "The build type used for creating bundle without a build type postfix.")
+set(CELIX_NO_POSTFIX_BUILD_TYPES RelWithDebInfo Release CACHE STRING "The build type used for creating bundle without a build type postfix.")
find_program(JAR_COMMAND jar NO_CMAKE_FIND_ROOT_PATH)
@@ -198,7 +198,7 @@ function(add_celix_bundle)
set(BUNDLE_FILENAME ${BUNDLE_TARGET_NAME})
endif ()
- if ("${CMAKE_BUILD_TYPE}" STREQUAL "${CELIX_NO_POSTFIX_BUILD_TYPE}")
+ if (${CMAKE_BUILD_TYPE} IN_LIST CELIX_NO_POSTFIX_BUILD_TYPES)
set(BUNDLE_FILENAME ${BUNDLE_FILENAME}.zip)
else ()
set(BUNDLE_FILENAME ${BUNDLE_FILENAME}-${CMAKE_BUILD_TYPE}.zip)