Commit b0d05cf0 authored by Brad King's avatar Brad King 💬
Browse files

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

parent d392acb4
......@@ -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"
......
......@@ -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
......
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment