diff options
| author | David Cole <david.cole@kitware.com> | 2009-10-25 21:00:51 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2009-10-25 21:00:51 (GMT) |
| commit | 62f80415a90d5e30c98a4613ace4fb613a52f878 (patch) | |
| tree | 309c9e3b4abad0a4dc67b04eddebf4ebdd06d064 /Tests | |
| parent | 609d27e4fad50dc5b5fbbfd8356cf0e70e60d3e3 (diff) | |
| download | CMake-62f80415a90d5e30c98a4613ace4fb613a52f878.zip CMake-62f80415a90d5e30c98a4613ace4fb613a52f878.tar.gz CMake-62f80415a90d5e30c98a4613ace4fb613a52f878.tar.bz2 | |
Turn on the NSIS binary for the CPackComponents test if NSIS is found. Should increase coverage of the NSIS generator on the dash16 coverage dashboard.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLists.txt | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 5d72c5e..ba9139d 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -423,14 +423,15 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel set(CTEST_RUN_CPackComponents ${CTEST_TEST_CPACK}) set(CTEST_package_X11_TEST ${CTEST_TEST_CPACK}) + find_program(NSIS_MAKENSIS_EXECUTABLE NAMES makensis + PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS] + DOC "makensis program location" + ) + # But on Windows, only run the CPackComponents test if the NSIS # installer builder is available: # if(WIN32) - find_program(NSIS_MAKENSIS_EXECUTABLE NAMES makensis - PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\NSIS] - DOC "makensis.exe location" - ) if(NSIS_MAKENSIS_EXECUTABLE) set(CTEST_RUN_CPackComponents ON) else(NSIS_MAKENSIS_EXECUTABLE) @@ -444,6 +445,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel if(APPLE) set(CPackComponents_EXTRA_OPTIONS -DCPACK_BINARY_DRAGNDROP:BOOL=ON) endif(APPLE) + if(NSIS_MAKENSIS_EXECUTABLE) + set(CPackComponents_EXTRA_OPTIONS ${CPackComponents_EXTRA_OPTIONS} + -DCPACK_BINARY_NSIS:BOOL=ON) + endif(NSIS_MAKENSIS_EXECUTABLE) ADD_TEST(CPackComponents ${CMAKE_CTEST_COMMAND} --build-and-test |