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

ENH: Updated SimpleInstall test to test new versioned executable and OUTPUT_NAME support.

This commit is contained in:
Brad King 2005-08-17 16:19:33 -04:00
parent d392acb4e6
commit b0d05cf020
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/CMakeLists.txt
View File

@ -427,7 +427,7 @@ IF(BUILD_TESTING)
--build-two-config --build-two-config
--build-options --build-options
"-DCMAKE_INSTALL_PREFIX:PATH=${SimpleInstallInstallDir}" "-DCMAKE_INSTALL_PREFIX:PATH=${SimpleInstallInstallDir}"
--test-command ${SimpleInstallInstallDir}/bin/SimpleInstall) --test-command ${SimpleInstallInstallDir}/bin/SimpleInstallExe)
ADD_TEST(SimpleInstall-Stage2 ${CMAKE_CTEST_COMMAND} ADD_TEST(SimpleInstall-Stage2 ${CMAKE_CTEST_COMMAND}
--build-and-test --build-and-test
"${CMake_SOURCE_DIR}/Tests/SimpleInstallS2" "${CMake_SOURCE_DIR}/Tests/SimpleInstallS2"

2
Tests/SimpleInstall/CMakeLists.txt
View File

@ -65,6 +65,8 @@ ELSE(STAGE2)
INSTALL_TARGETS(/lib test1 test2 test3 test4) INSTALL_TARGETS(/lib test1 test2 test3 test4)
INSTALL_TARGETS(/include lib1.h lib2.h lib3.h) 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 SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES PRE_INSTALL_SCRIPT
${CMAKE_CURRENT_SOURCE_DIR}/PreInstall.cmake) ${CMAKE_CURRENT_SOURCE_DIR}/PreInstall.cmake)
SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES POST_INSTALL_SCRIPT SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES POST_INSTALL_SCRIPT

2
Tests/SimpleInstallS2/CMakeLists.txt
View File

@ -65,6 +65,8 @@ ELSE(STAGE2)
INSTALL_TARGETS(/lib test1 test2 test3 test4) INSTALL_TARGETS(/lib test1 test2 test3 test4)
INSTALL_TARGETS(/include lib1.h lib2.h lib3.h) 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 SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES PRE_INSTALL_SCRIPT
${CMAKE_CURRENT_SOURCE_DIR}/PreInstall.cmake) ${CMAKE_CURRENT_SOURCE_DIR}/PreInstall.cmake)
SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES POST_INSTALL_SCRIPT SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES POST_INSTALL_SCRIPT