浏览代码

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

Brad King 20 年之前
父节点
当前提交
b0d05cf020
共有 3 个文件被更改,包括 5 次插入1 次删除
  1. 1 1
      Source/CMakeLists.txt
  2. 2 0
      Tests/SimpleInstall/CMakeLists.txt
  3. 2 0
      Tests/SimpleInstallS2/CMakeLists.txt

+ 1 - 1
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"

+ 2 - 0
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 

+ 2 - 0
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