summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorEric NOULARD <eric.noulard@gmail.com>2011-03-23 17:28:05 (GMT)
committerEric NOULARD <eric.noulard@gmail.com>2011-03-23 17:28:05 (GMT)
commit6dfc818394d302d5966431fc72b4150777780b79 (patch)
treec4837ae3a47a244be37e835760feac8d86bd86cf /Tests
parent4344e83fcf521072b0101b67a50e31e7f4032abb (diff)
downloadCMake-6dfc818394d302d5966431fc72b4150777780b79.zip
CMake-6dfc818394d302d5966431fc72b4150777780b79.tar.gz
CMake-6dfc818394d302d5966431fc72b4150777780b79.tar.bz2
CPack fix #11930 and simplifies component packaging options
Diffstat (limited to 'Tests')
-rw-r--r--Tests/CMakeLists.txt1
-rw-r--r--Tests/CPackComponentsForAll/MyLibCPackConfig-AllGroupsInOne.cmake.in22
-rw-r--r--Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake41
3 files changed, 20 insertions, 44 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 77c5752..016b213 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -583,7 +583,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
list(APPEND CWAYLST "OnePackPerGroup")
list(APPEND CWAYLST "IgnoreGroup")
list(APPEND CWAYLST "AllInOne")
- list(APPEND CWAYLST "AllGroupsInOne")
foreach(CPackGen ${GENLST})
set(CPackRun_CPackGen "-DCPackGen=${CPackGen}")
foreach(CPackComponentWay ${CWAYLST})
diff --git a/Tests/CPackComponentsForAll/MyLibCPackConfig-AllGroupsInOne.cmake.in b/Tests/CPackComponentsForAll/MyLibCPackConfig-AllGroupsInOne.cmake.in
deleted file mode 100644
index 85626be..0000000
--- a/Tests/CPackComponentsForAll/MyLibCPackConfig-AllGroupsInOne.cmake.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Activate component packaging
-#
-if(CPACK_GENERATOR MATCHES "ZIP")
- set(CPACK_ARCHIVE_COMPONENT_INSTALL "ON")
-endif(CPACK_GENERATOR MATCHES "ZIP")
-
-if(CPACK_GENERATOR MATCHES "RPM")
- set(CPACK_RPM_COMPONENT_INSTALL "ON")
-endif(CPACK_GENERATOR MATCHES "RPM")
-
-if(CPACK_GENERATOR MATCHES "DEB")
- set(CPACK_DEB_COMPONENT_INSTALL "ON")
-endif(CPACK_GENERATOR MATCHES "DEB")
-
-#
-# Choose grouping way
-#
-set(CPACK_COMPONENTS_ALL_GROUPS_IN_ONE_PACKAGE 1)
-#set(CPACK_COMPONENTS_GROUPING)
-#set(CPACK_COMPONENTS_IGNORE_GROUPS 1)
-#set(CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE 1)
diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index ae0ee1a..77a1979 100644
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@ -37,38 +37,37 @@ if(CPackGen MATCHES "ZIP")
set(expected_file_mask "${CPackComponentsForAll_BINARY_DIR}/MyLib-*.zip")
if (${CPackComponentWay} STREQUAL "default")
set(expected_count 1)
- endif(${CPackComponentWay} STREQUAL "default")
- if (${CPackComponentWay} STREQUAL "OnePackPerGroup")
+ elseif (${CPackComponentWay} STREQUAL "OnePackPerGroup")
set(expected_count 3)
- endif (${CPackComponentWay} STREQUAL "OnePackPerGroup")
- if (${CPackComponentWay} STREQUAL "IgnoreGroup")
+ elseif (${CPackComponentWay} STREQUAL "IgnoreGroup")
set(expected_count 4)
- endif (${CPackComponentWay} STREQUAL "IgnoreGroup")
- if (${CPackComponentWay} STREQUAL "AllInOne")
+ elseif (${CPackComponentWay} STREQUAL "AllInOne")
set(expected_count 1)
- endif (${CPackComponentWay} STREQUAL "AllInOne")
- if (${CPackComponentWay} STREQUAL "AllGroupsInOne")
- set(expected_count 1)
- endif (${CPackComponentWay} STREQUAL "AllGroupsInOne")
+ endif ()
elseif (CPackGen MATCHES "RPM")
set(config_verbose -D "CPACK_RPM_PACKAGE_DEBUG=1")
set(expected_file_mask "${CPackComponentsForAll_BINARY_DIR}/MyLib-*.rpm")
if (${CPackComponentWay} STREQUAL "default")
set(expected_count 1)
- endif (${CPackComponentWay} STREQUAL "default")
- if (${CPackComponentWay} STREQUAL "OnePackPerGroup")
- set(expected_count 2)
- endif (${CPackComponentWay} STREQUAL "OnePackPerGroup")
- if (${CPackComponentWay} STREQUAL "IgnoreGroup")
+ elseif (${CPackComponentWay} STREQUAL "OnePackPerGroup")
+ set(expected_count 3)
+ elseif (${CPackComponentWay} STREQUAL "IgnoreGroup")
set(expected_count 4)
- endif (${CPackComponentWay} STREQUAL "IgnoreGroup")
- if (${CPackComponentWay} STREQUAL "AllInOne")
+ elseif (${CPackComponentWay} STREQUAL "AllInOne")
+ set(expected_count 1)
+ endif ()
+elseif (CPackGen MATCHES "DEB")
+ set(expected_file_mask "${CPackComponentsForAll_BINARY_DIR}/MyLib-*.deb")
+ if (${CPackComponentWay} STREQUAL "default")
set(expected_count 1)
- endif (${CPackComponentWay} STREQUAL "AllInOne")
- if (${CPackComponentWay} STREQUAL "AllGroupsInOne")
+ elseif (${CPackComponentWay} STREQUAL "OnePackPerGroup")
+ set(expected_count 3)
+ elseif (${CPackComponentWay} STREQUAL "IgnoreGroup")
+ set(expected_count 4)
+ elseif (${CPackComponentWay} STREQUAL "AllInOne")
set(expected_count 1)
- endif (${CPackComponentWay} STREQUAL "AllGroupsInOne")
-endif(CPackGen MATCHES "ZIP")
+ endif ()
+endif()
# clean-up previously CPack generated files
if(expected_file_mask)