Просмотр исходного кода

BUG: Need to execute sample_script.bat on windows and sample_script otherwise.

Brad King 19 лет назад
Родитель
Сommit
08398a9f0c
2 измененных файлов с 12 добавлено и 2 удалено
  1. 6 1
      Tests/SimpleInstall/CMakeLists.txt
  2. 6 1
      Tests/SimpleInstallS2/CMakeLists.txt

+ 6 - 1
Tests/SimpleInstall/CMakeLists.txt

@@ -81,11 +81,16 @@ IF(STAGE2)
   ENDIF(EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/include/Debug/lib1release.h")
 
   # Check for failure of directory installation.
+  IF(WIN32 AND NOT CYGWIN)
+    SET(BAT .bat)
+  ELSE(WIN32 AND NOT CYGWIN)
+    SET(BAT)
+  ENDIF(WIN32 AND NOT CYGWIN)
   IF(NOT EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/TestSubDir/TSD.h")
     MESSAGE(FATAL_ERROR "Directory installation did not install TSD.h")
   ENDIF(NOT EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/TestSubDir/TSD.h")
   EXECUTE_PROCESS(
-    COMMAND "${CMAKE_INSTALL_PREFIX}/MyTest/share/sample_script"
+    COMMAND "${CMAKE_INSTALL_PREFIX}/MyTest/share/sample_script${BAT}"
     RESULT_VARIABLE SAMPLE_SCRIPT_RESULT
     OUTPUT_VARIABLE SAMPLE_SCRIPT_OUTPUT
     )

+ 6 - 1
Tests/SimpleInstallS2/CMakeLists.txt

@@ -81,11 +81,16 @@ IF(STAGE2)
   ENDIF(EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/include/Debug/lib1release.h")
 
   # Check for failure of directory installation.
+  IF(WIN32 AND NOT CYGWIN)
+    SET(BAT .bat)
+  ELSE(WIN32 AND NOT CYGWIN)
+    SET(BAT)
+  ENDIF(WIN32 AND NOT CYGWIN)
   IF(NOT EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/TestSubDir/TSD.h")
     MESSAGE(FATAL_ERROR "Directory installation did not install TSD.h")
   ENDIF(NOT EXISTS "${CMAKE_INSTALL_PREFIX}/MyTest/share/TestSubDir/TSD.h")
   EXECUTE_PROCESS(
-    COMMAND "${CMAKE_INSTALL_PREFIX}/MyTest/share/sample_script"
+    COMMAND "${CMAKE_INSTALL_PREFIX}/MyTest/share/sample_script${BAT}"
     RESULT_VARIABLE SAMPLE_SCRIPT_RESULT
     OUTPUT_VARIABLE SAMPLE_SCRIPT_OUTPUT
     )