diff options
| author | Brad King <brad.king@kitware.com> | 2005-08-17 20:19:33 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2005-08-17 20:19:33 (GMT) |
| commit | b0d05cf020980aa571a35bda65126b3d2f1dd92c (patch) | |
| tree | 591c6a65f0613e75edf15e7f80533547d499081b | |
| parent | d392acb4e65e2ce133acf4a07dba983060f58725 (diff) | |
| download | CMake-b0d05cf020980aa571a35bda65126b3d2f1dd92c.zip CMake-b0d05cf020980aa571a35bda65126b3d2f1dd92c.tar.gz CMake-b0d05cf020980aa571a35bda65126b3d2f1dd92c.tar.bz2 | |
ENH: Updated SimpleInstall test to test new versioned executable and OUTPUT_NAME support.
| -rw-r--r-- | Source/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/SimpleInstall/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/SimpleInstallS2/CMakeLists.txt | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index b98a3aa..aed1343 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -427,7 +427,7 @@ IF(BUILD_TESTING) --build-two-config --build-options "-DCMAKE_INSTALL_PREFIX:PATH=${SimpleInstallInstallDir}" - --test-command ${SimpleInstallInstallDir}/bin/SimpleInstall) + --test-command ${SimpleInstallInstallDir}/bin/SimpleInstallExe) ADD_TEST(SimpleInstall-Stage2 ${CMAKE_CTEST_COMMAND} --build-and-test "${CMake_SOURCE_DIR}/Tests/SimpleInstallS2" diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt index c51300c..223dcb8 100644 --- a/Tests/SimpleInstall/CMakeLists.txt +++ b/Tests/SimpleInstall/CMakeLists.txt @@ -65,6 +65,8 @@ ELSE(STAGE2) INSTALL_TARGETS(/lib test1 test2 test3 test4) INSTALL_TARGETS(/include lib1.h lib2.h lib3.h) + SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES OUTPUT_NAME SimpleInstallExe) + SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES VERSION 1.2) SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES PRE_INSTALL_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/PreInstall.cmake) SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES POST_INSTALL_SCRIPT diff --git a/Tests/SimpleInstallS2/CMakeLists.txt b/Tests/SimpleInstallS2/CMakeLists.txt index c51300c..223dcb8 100644 --- a/Tests/SimpleInstallS2/CMakeLists.txt +++ b/Tests/SimpleInstallS2/CMakeLists.txt @@ -65,6 +65,8 @@ ELSE(STAGE2) INSTALL_TARGETS(/lib test1 test2 test3 test4) INSTALL_TARGETS(/include lib1.h lib2.h lib3.h) + SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES OUTPUT_NAME SimpleInstallExe) + SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES VERSION 1.2) SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES PRE_INSTALL_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/PreInstall.cmake) SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES POST_INSTALL_SCRIPT |