kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ERR: Remove testinf of PREORDER on Windows

This commit is contained in:
Andy Cedilnik 2004-06-03 19:12:06 -04:00
parent 00acf804f6
commit 30e1007048
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Tests/SimpleInstall/CMakeLists.txt
View File

@ -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)

5
Tests/SimpleInstallS2/CMakeLists.txt
View File

@ -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)