diff options
| author | Brad King <brad.king@kitware.com> | 2005-08-08 15:33:47 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2005-08-08 15:33:47 (GMT) |
| commit | 2c658a6300d1f90cd922aa35e97d248942aced54 (patch) | |
| tree | e39f9c3dd6a530aaa131accea28dcc8408aa2e6c /Tests | |
| parent | d6a3268b3ed71ce36ce78f3a20b01a7eabe7601d (diff) | |
| download | CMake-2c658a6300d1f90cd922aa35e97d248942aced54.zip CMake-2c658a6300d1f90cd922aa35e97d248942aced54.tar.gz CMake-2c658a6300d1f90cd922aa35e97d248942aced54.tar.bz2 | |
BUG: Need TSD target to be built before SimpleInstall.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/SimpleInstall/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | Tests/SimpleInstallS2/CMakeLists.txt | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt index 9fe6848..c51300c 100644 --- a/Tests/SimpleInstall/CMakeLists.txt +++ b/Tests/SimpleInstall/CMakeLists.txt @@ -42,10 +42,6 @@ IF(STAGE2) INSTALL_TARGETS(/bin SimpleInstallS2) ELSE(STAGE2) - IF(CMAKE_GENERATOR MATCHES "Makefiles") - ADD_SUBDIRECTORY(TestSubDir) - ENDIF(CMAKE_GENERATOR MATCHES "Makefiles") - # this is stage 1, so create libraries and modules and install everything ADD_LIBRARY(test1 STATIC lib1.cxx) ADD_LIBRARY(test2 SHARED lib2.cxx) @@ -56,6 +52,11 @@ ELSE(STAGE2) TARGET_LINK_LIBRARIES(SimpleInstall test1 test2 test4) SET(install_target SimpleInstall) + IF(CMAKE_GENERATOR MATCHES "Makefiles") + ADD_SUBDIRECTORY(TestSubDir) + ADD_DEPENDENCIES(SimpleInstall TSD) + ENDIF(CMAKE_GENERATOR MATCHES "Makefiles") + ADD_DEPENDENCIES(SimpleInstall test3) ADD_DEPENDENCIES(test2 test3) ADD_DEPENDENCIES(test4 test2) diff --git a/Tests/SimpleInstallS2/CMakeLists.txt b/Tests/SimpleInstallS2/CMakeLists.txt index 9fe6848..c51300c 100644 --- a/Tests/SimpleInstallS2/CMakeLists.txt +++ b/Tests/SimpleInstallS2/CMakeLists.txt @@ -42,10 +42,6 @@ IF(STAGE2) INSTALL_TARGETS(/bin SimpleInstallS2) ELSE(STAGE2) - IF(CMAKE_GENERATOR MATCHES "Makefiles") - ADD_SUBDIRECTORY(TestSubDir) - ENDIF(CMAKE_GENERATOR MATCHES "Makefiles") - # this is stage 1, so create libraries and modules and install everything ADD_LIBRARY(test1 STATIC lib1.cxx) ADD_LIBRARY(test2 SHARED lib2.cxx) @@ -56,6 +52,11 @@ ELSE(STAGE2) TARGET_LINK_LIBRARIES(SimpleInstall test1 test2 test4) SET(install_target SimpleInstall) + IF(CMAKE_GENERATOR MATCHES "Makefiles") + ADD_SUBDIRECTORY(TestSubDir) + ADD_DEPENDENCIES(SimpleInstall TSD) + ENDIF(CMAKE_GENERATOR MATCHES "Makefiles") + ADD_DEPENDENCIES(SimpleInstall test3) ADD_DEPENDENCIES(test2 test3) ADD_DEPENDENCIES(test4 test2) |