summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2006-01-17 19:35:04 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2006-01-17 19:35:04 (GMT)
commitac58fb88b9628f17dafc7788c0b35cfe7da6da4f (patch)
tree38e5e19dd49cc7f0c1329b263cc6f486f7502195 /Tests
parent9891260a6dab66c9ea44b5c2e244f3128625baf5 (diff)
downloadCMake-ac58fb88b9628f17dafc7788c0b35cfe7da6da4f.zip
CMake-ac58fb88b9628f17dafc7788c0b35cfe7da6da4f.tar.gz
CMake-ac58fb88b9628f17dafc7788c0b35cfe7da6da4f.tar.bz2
ENH: more fixes for watcom
Diffstat (limited to 'Tests')
-rw-r--r--Tests/Complex/Executable/CMakeLists.txt17
-rw-r--r--Tests/ComplexOneConfig/Executable/CMakeLists.txt17
-rw-r--r--Tests/ComplexRelativePaths/Executable/CMakeLists.txt17
3 files changed, 30 insertions, 21 deletions
diff --git a/Tests/Complex/Executable/CMakeLists.txt b/Tests/Complex/Executable/CMakeLists.txt
index 78ed587..0f5add9 100644
--- a/Tests/Complex/Executable/CMakeLists.txt
+++ b/Tests/Complex/Executable/CMakeLists.txt
@@ -6,13 +6,16 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTEST_CXX_FLAGS")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTEST_C_FLAGS")
SET(CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}")
-# Link to CMake lib
-LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source)
-LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
-LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
-LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
-LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
-# Use LINK_LIBRARIES instead of TARGET_LINK_LIBRARIES to
+IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+ # Link to CMake lib
+ LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source)
+ LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
+ LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
+ LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
+ LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
+ENDIF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+
+ # Use LINK_LIBRARIES instead of TARGET_LINK_LIBRARIES to
SET(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared)
LINK_LIBRARIES(${COMPLEX_LIBS})
diff --git a/Tests/ComplexOneConfig/Executable/CMakeLists.txt b/Tests/ComplexOneConfig/Executable/CMakeLists.txt
index 78ed587..0f5add9 100644
--- a/Tests/ComplexOneConfig/Executable/CMakeLists.txt
+++ b/Tests/ComplexOneConfig/Executable/CMakeLists.txt
@@ -6,13 +6,16 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTEST_CXX_FLAGS")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTEST_C_FLAGS")
SET(CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}")
-# Link to CMake lib
-LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source)
-LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
-LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
-LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
-LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
-# Use LINK_LIBRARIES instead of TARGET_LINK_LIBRARIES to
+IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+ # Link to CMake lib
+ LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source)
+ LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
+ LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
+ LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
+ LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
+ENDIF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+
+ # Use LINK_LIBRARIES instead of TARGET_LINK_LIBRARIES to
SET(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared)
LINK_LIBRARIES(${COMPLEX_LIBS})
diff --git a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt
index 78ed587..0f5add9 100644
--- a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt
+++ b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt
@@ -6,13 +6,16 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTEST_CXX_FLAGS")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTEST_C_FLAGS")
SET(CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}")
-# Link to CMake lib
-LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source)
-LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
-LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
-LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
-LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
-# Use LINK_LIBRARIES instead of TARGET_LINK_LIBRARIES to
+IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+ # Link to CMake lib
+ LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source)
+ LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
+ LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
+ LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
+ LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
+ENDIF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+
+ # Use LINK_LIBRARIES instead of TARGET_LINK_LIBRARIES to
SET(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared)
LINK_LIBRARIES(${COMPLEX_LIBS})