kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'CPackRPM-enableCPackTests' 

dc9965f CPackRPM  do not run test if build dir contains space
e4d4dfc CPackRPM  activate CPackRPM test on Linux systems where rpmbuild is found
This commit is contained in:
Brad King 2011-03-08 14:22:28 -05:00 committed by CMake Topic Stage
parent 9c1344f33b dc9965f9a0
commit 5148d0b92d
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tests/CMakeLists.txt
View File

@ -566,6 +566,12 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
set(CPackRun_CPackCommand "-DCPackCommand=${CMAKE_CPACK_COMMAND}") set(CPackRun_CPackCommand "-DCPackCommand=${CMAKE_CPACK_COMMAND}")
# set up list of CPack generators # set up list of CPack generators
list(APPEND GENLST "ZIP") list(APPEND GENLST "ZIP")
if (CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT CMAKE_CURRENT_BINARY_DIR MATCHES ".* .*")
find_program(RPMBUILD NAMES rpmbuild)
endif(CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT CMAKE_CURRENT_BINARY_DIR MATCHES ".* .*")
if (RPMBUILD)
list(APPEND GENLST "RPM")
endif(RPMBUILD)
# set up list of component packaging ways # set up list of component packaging ways
list(APPEND CWAYLST "default") list(APPEND CWAYLST "default")
list(APPEND CWAYLST "OnePackPerGroup") list(APPEND CWAYLST "OnePackPerGroup")

17
Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
View File

@ -50,6 +50,23 @@ if(CPackGen MATCHES "ZIP")
if (${CPackComponentWay} STREQUAL "AllGroupsInOne") if (${CPackComponentWay} STREQUAL "AllGroupsInOne")
set(expected_count 1) set(expected_count 1)
endif (${CPackComponentWay} STREQUAL "AllGroupsInOne") endif (${CPackComponentWay} STREQUAL "AllGroupsInOne")
elseif (CPackGen MATCHES "RPM")
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")
set(expected_count 4)
endif (${CPackComponentWay} STREQUAL "IgnoreGroup")
if (${CPackComponentWay} STREQUAL "AllInOne")
set(expected_count 1)
endif (${CPackComponentWay} STREQUAL "AllInOne")
if (${CPackComponentWay} STREQUAL "AllGroupsInOne")
set(expected_count 1)
endif (${CPackComponentWay} STREQUAL "AllGroupsInOne")
endif(CPackGen MATCHES "ZIP") endif(CPackGen MATCHES "ZIP")
# clean-up previously CPack generated files # clean-up previously CPack generated files