diff options
| author | Brad King <brad.king@kitware.com> | 2006-08-21 21:37:40 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2006-08-21 21:37:40 (GMT) |
| commit | 08398a9f0c9bfe27ecb6d75432e2ecfd85f6159f (patch) | |
| tree | f487cd435fb58eb07b3912a91597fff3a68bb911 | |
| parent | c58777ec475ae1a03147246a15315a52538a5d41 (diff) | |
| download | CMake-08398a9f0c9bfe27ecb6d75432e2ecfd85f6159f.zip CMake-08398a9f0c9bfe27ecb6d75432e2ecfd85f6159f.tar.gz CMake-08398a9f0c9bfe27ecb6d75432e2ecfd85f6159f.tar.bz2 | |
BUG: Need to execute sample_script.bat on windows and sample_script otherwise.
| -rw-r--r-- | Tests/SimpleInstall/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | Tests/SimpleInstallS2/CMakeLists.txt | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt index f543d43..029600b 100644 --- a/Tests/SimpleInstall/CMakeLists.txt +++ b/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 ) diff --git a/Tests/SimpleInstallS2/CMakeLists.txt b/Tests/SimpleInstallS2/CMakeLists.txt index f543d43..029600b 100644 --- a/Tests/SimpleInstallS2/CMakeLists.txt +++ b/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 ) |