From 30e1007048289ee565f475dcd0dd1a488bc8a665 Mon Sep 17 00:00:00 2001 From: Andy Cedilnik Date: Thu, 3 Jun 2004 19:12:06 -0400 Subject: [PATCH] ERR: Remove testinf of PREORDER on Windows --- Tests/SimpleInstall/CMakeLists.txt | 5 +++-- 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 20fd15d7a..1d15e56bc 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 20fd15d7a..1d15e56bc 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)