diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2004-06-03 23:12:06 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2004-06-03 23:12:06 (GMT) |
| commit | 30e1007048289ee565f475dcd0dd1a488bc8a665 (patch) | |
| tree | ac7bb6666e4f41b3e0ac86852d842f55f594e9b6 /Tests | |
| parent | 00acf804f65b41bed14f684a536a26827dfe6f32 (diff) | |
| download | CMake-30e1007048289ee565f475dcd0dd1a488bc8a665.zip CMake-30e1007048289ee565f475dcd0dd1a488bc8a665.tar.gz CMake-30e1007048289ee565f475dcd0dd1a488bc8a665.tar.bz2 | |
ERR: Remove testinf of PREORDER on Windows
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/SimpleInstall/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Tests/SimpleInstallS2/CMakeLists.txt | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt index 20fd15d..1d15e56 100644 --- a/Tests/SimpleInstall/CMakeLists.txt +++ b/Tests/SimpleInstall/CMakeLists.txt @@ -50,7 +50,9 @@ IF(STAGE2) INSTALL_TARGETS(/bin SimpleInstallS2) ELSE(STAGE2) - SUBDIRS(PREORDER TestSubDir) + IF(CMAKE_GENERATOR MATCHES "Makefiles") + SUBDIRS(PREORDER TestSubDir) + ENDIF(CMAKE_GENERATOR MATCHES "Makefiles") # this is stage 1, so create libraries and modules and install everything ADD_LIBRARY(test1 STATIC lib1.cxx) @@ -61,7 +63,6 @@ ELSE(STAGE2) TARGET_LINK_LIBRARIES(SimpleInstall test1 test2) SET(install_target SimpleInstall) - ADD_DEPENDENCIES(test2 TSD) ADD_DEPENDENCIES(SimpleInstall test3) ADD_DEPENDENCIES(test2 test3) diff --git a/Tests/SimpleInstallS2/CMakeLists.txt b/Tests/SimpleInstallS2/CMakeLists.txt index 20fd15d..1d15e56 100644 --- a/Tests/SimpleInstallS2/CMakeLists.txt +++ b/Tests/SimpleInstallS2/CMakeLists.txt @@ -50,7 +50,9 @@ IF(STAGE2) INSTALL_TARGETS(/bin SimpleInstallS2) ELSE(STAGE2) - SUBDIRS(PREORDER TestSubDir) + IF(CMAKE_GENERATOR MATCHES "Makefiles") + SUBDIRS(PREORDER TestSubDir) + ENDIF(CMAKE_GENERATOR MATCHES "Makefiles") # this is stage 1, so create libraries and modules and install everything ADD_LIBRARY(test1 STATIC lib1.cxx) @@ -61,7 +63,6 @@ ELSE(STAGE2) TARGET_LINK_LIBRARIES(SimpleInstall test1 test2) SET(install_target SimpleInstall) - ADD_DEPENDENCIES(test2 TSD) ADD_DEPENDENCIES(SimpleInstall test3) ADD_DEPENDENCIES(test2 test3) |