Răsfoiți Sursa

ERR: Remove testinf of PREORDER on Windows

Andy Cedilnik 21 ani în urmă
părinte
comite
30e1007048
2 a modificat fișierele cu 6 adăugiri și 4 ștergeri
  1. 3 2
      Tests/SimpleInstall/CMakeLists.txt
  2. 3 2
      Tests/SimpleInstallS2/CMakeLists.txt

+ 3 - 2
Tests/SimpleInstall/CMakeLists.txt

@@ -50,7 +50,9 @@ IF(STAGE2)
 
 
   INSTALL_TARGETS(/bin SimpleInstallS2)
   INSTALL_TARGETS(/bin SimpleInstallS2)
 ELSE(STAGE2)
 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
   # this is stage 1, so create libraries and modules and install everything
   ADD_LIBRARY(test1 STATIC lib1.cxx)
   ADD_LIBRARY(test1 STATIC lib1.cxx)
@@ -61,7 +63,6 @@ ELSE(STAGE2)
   TARGET_LINK_LIBRARIES(SimpleInstall test1 test2)
   TARGET_LINK_LIBRARIES(SimpleInstall test1 test2)
   SET(install_target SimpleInstall)
   SET(install_target SimpleInstall)
 
 
-  ADD_DEPENDENCIES(test2 TSD)
   ADD_DEPENDENCIES(SimpleInstall test3)
   ADD_DEPENDENCIES(SimpleInstall test3)
   ADD_DEPENDENCIES(test2 test3)
   ADD_DEPENDENCIES(test2 test3)
 
 

+ 3 - 2
Tests/SimpleInstallS2/CMakeLists.txt

@@ -50,7 +50,9 @@ IF(STAGE2)
 
 
   INSTALL_TARGETS(/bin SimpleInstallS2)
   INSTALL_TARGETS(/bin SimpleInstallS2)
 ELSE(STAGE2)
 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
   # this is stage 1, so create libraries and modules and install everything
   ADD_LIBRARY(test1 STATIC lib1.cxx)
   ADD_LIBRARY(test1 STATIC lib1.cxx)
@@ -61,7 +63,6 @@ ELSE(STAGE2)
   TARGET_LINK_LIBRARIES(SimpleInstall test1 test2)
   TARGET_LINK_LIBRARIES(SimpleInstall test1 test2)
   SET(install_target SimpleInstall)
   SET(install_target SimpleInstall)
 
 
-  ADD_DEPENDENCIES(test2 TSD)
   ADD_DEPENDENCIES(SimpleInstall test3)
   ADD_DEPENDENCIES(SimpleInstall test3)
   ADD_DEPENDENCIES(test2 test3)
   ADD_DEPENDENCIES(test2 test3)