From ac58fb88b9628f17dafc7788c0b35cfe7da6da4f Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Tue, 17 Jan 2006 14:35:04 -0500 Subject: ENH: more fixes for watcom --- Tests/Complex/Executable/CMakeLists.txt | 17 ++++++++++------- Tests/ComplexOneConfig/Executable/CMakeLists.txt | 17 ++++++++++------- Tests/ComplexRelativePaths/Executable/CMakeLists.txt | 17 ++++++++++------- 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}) -- cgit v0.12