diff options
| author | David Cole <david.cole@kitware.com> | 2012-12-05 15:31:05 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-12-05 15:31:05 (GMT) |
| commit | 2bb2745fa8c260d12aca33d2e1fd26a92d3bfa6b (patch) | |
| tree | 1199ee50029eb12ff9cb068f18006bbce29118cd /Tests/CMakeLists.txt | |
| parent | 799befa21535c828e22b2fce3c472ea2f1eabd3c (diff) | |
| parent | a74bd470a4d01cfa06710d039bb435b02682ac3f (diff) | |
| download | CMake-2bb2745fa8c260d12aca33d2e1fd26a92d3bfa6b.zip CMake-2bb2745fa8c260d12aca33d2e1fd26a92d3bfa6b.tar.gz CMake-2bb2745fa8c260d12aca33d2e1fd26a92d3bfa6b.tar.bz2 | |
Merge topic 'fix-11575-add-wix-support-to-cpack'
a74bd47 CPack: Fix dashboard errors and warnings (#11575)
ad0f735 CPack: Fix dashboard warnings (#11575)
0729ad4 CPack: Fix dashboard errors (#11575)
85baac1 CPack: Add a WiX Generator (#11575)
Diffstat (limited to 'Tests/CMakeLists.txt')
| -rw-r--r-- | Tests/CMakeLists.txt | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index e8fa7c6..f443b5b 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -697,6 +697,29 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ endif() endif() + # On Windows run the CPackWiXGenerator test + # if the WiX Toolset seems to be available + if(WIN32) + file(TO_CMAKE_PATH "$ENV{WIX}" WIX_ROOT) + + find_program(WIX_LIGHT_EXECUTABLE light + PATHS "${WIX_ROOT}/bin" + DOC "WiX Toolset light.exe location") + + if(WIX_LIGHT_EXECUTABLE) + add_test(CPackWiXGenerator ${CMAKE_CTEST_COMMAND} + --build-and-test + "${CMake_SOURCE_DIR}/Tests/CPackWiXGenerator" + "${CMake_BINARY_DIR}/Tests/CPackWiXGenerator" + --build-generator ${CMAKE_TEST_GENERATOR} + --build-project CPackWiXGenerator + --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} + --test-command ${CMAKE_CMAKE_COMMAND} + "-DCPackWiXGenerator_BINARY_DIR:PATH=${CMake_BINARY_DIR}/Tests/CPackWiXGenerator" + -P "${CMake_SOURCE_DIR}/Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake") + endif() + endif() + if(CTEST_RUN_CPackComponents) set(CPackComponents_EXTRA_OPTIONS) if(APPLE) |