diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2002-05-02 17:17:10 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2002-05-02 17:17:10 (GMT) |
| commit | 27fe57b716555ffa31b16e98841c7f1a82228740 (patch) | |
| tree | 361f44d30ef7bdba9c37b389824ac9670801177e /Tests | |
| parent | b5b46599feb33d7f873faca6215f1717ddd209e6 (diff) | |
| download | CMake-27fe57b716555ffa31b16e98841c7f1a82228740.zip CMake-27fe57b716555ffa31b16e98841c7f1a82228740.tar.gz CMake-27fe57b716555ffa31b16e98841c7f1a82228740.tar.bz2 | |
ENH: change LINK_LIBRARY to add to targets
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/Complex/Executable/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | Tests/ComplexOneConfig/Executable/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | Tests/ComplexRelativePaths/Executable/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | Tests/Dependency/Exec/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Tests/Dependency/Six/CMakeLists.txt | 2 |
5 files changed, 19 insertions, 36 deletions
diff --git a/Tests/Complex/Executable/CMakeLists.txt b/Tests/Complex/Executable/CMakeLists.txt index 30c60fe..72b77fa 100644 --- a/Tests/Complex/Executable/CMakeLists.txt +++ b/Tests/Complex/Executable/CMakeLists.txt @@ -5,22 +5,16 @@ CMAKE_MINIMUM_REQUIRED(VERSION 1.3) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTEST_CXX_FLAGS") SET_SOURCE_FILES_PROPERTIES(complex COMPILE_FLAGS "-DFILE_HAS_EXTRA_COMPILE_FLAGS") -ADD_EXECUTABLE(complex complex) -SET(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared) - +# Link to CMake lib +LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source) # Use LINK_LIBRARIES instead of TARGET_LINK_LIBRARIES to +SET(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared) LINK_LIBRARIES(${COMPLEX_LIBS}) -# -# Link to CMake lib -# Specify the same one for debug/optimized to increase coverage -# -LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source) +ADD_EXECUTABLE(complex complex) TARGET_LINK_LIBRARIES(complex - CMakeLib - debug CMakeLib - optimized CMakeLib) + CMakeLib) # # Output the files required by 'complex' to a file. diff --git a/Tests/ComplexOneConfig/Executable/CMakeLists.txt b/Tests/ComplexOneConfig/Executable/CMakeLists.txt index 30c60fe..72b77fa 100644 --- a/Tests/ComplexOneConfig/Executable/CMakeLists.txt +++ b/Tests/ComplexOneConfig/Executable/CMakeLists.txt @@ -5,22 +5,16 @@ CMAKE_MINIMUM_REQUIRED(VERSION 1.3) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTEST_CXX_FLAGS") SET_SOURCE_FILES_PROPERTIES(complex COMPILE_FLAGS "-DFILE_HAS_EXTRA_COMPILE_FLAGS") -ADD_EXECUTABLE(complex complex) -SET(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared) - +# Link to CMake lib +LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source) # Use LINK_LIBRARIES instead of TARGET_LINK_LIBRARIES to +SET(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared) LINK_LIBRARIES(${COMPLEX_LIBS}) -# -# Link to CMake lib -# Specify the same one for debug/optimized to increase coverage -# -LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source) +ADD_EXECUTABLE(complex complex) TARGET_LINK_LIBRARIES(complex - CMakeLib - debug CMakeLib - optimized CMakeLib) + CMakeLib) # # Output the files required by 'complex' to a file. diff --git a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt index 30c60fe..72b77fa 100644 --- a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt +++ b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt @@ -5,22 +5,16 @@ CMAKE_MINIMUM_REQUIRED(VERSION 1.3) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTEST_CXX_FLAGS") SET_SOURCE_FILES_PROPERTIES(complex COMPILE_FLAGS "-DFILE_HAS_EXTRA_COMPILE_FLAGS") -ADD_EXECUTABLE(complex complex) -SET(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared) - +# Link to CMake lib +LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source) # Use LINK_LIBRARIES instead of TARGET_LINK_LIBRARIES to +SET(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared) LINK_LIBRARIES(${COMPLEX_LIBS}) -# -# Link to CMake lib -# Specify the same one for debug/optimized to increase coverage -# -LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source) +ADD_EXECUTABLE(complex complex) TARGET_LINK_LIBRARIES(complex - CMakeLib - debug CMakeLib - optimized CMakeLib) + CMakeLib) # # Output the files required by 'complex' to a file. diff --git a/Tests/Dependency/Exec/CMakeLists.txt b/Tests/Dependency/Exec/CMakeLists.txt index 1867b1d..97fffe7 100644 --- a/Tests/Dependency/Exec/CMakeLists.txt +++ b/Tests/Dependency/Exec/CMakeLists.txt @@ -1,6 +1,7 @@ -ADD_EXECUTABLE( exec ExecMain.c ) - # This executable directly depends on NoDepB, NoDepC, SixA and SixB. However, # since NoDepB and NoDepC do not have explicit dependency information, # and they depend on NoDepA, we have to manually specify that dependency. LINK_LIBRARIES( NoDepB NoDepC NoDepA SixB SixA ) + +ADD_EXECUTABLE( exec ExecMain.c ) + diff --git a/Tests/Dependency/Six/CMakeLists.txt b/Tests/Dependency/Six/CMakeLists.txt index 2cb1586..d0abdd6 100644 --- a/Tests/Dependency/Six/CMakeLists.txt +++ b/Tests/Dependency/Six/CMakeLists.txt @@ -3,10 +3,10 @@ # specify them in the correct order. LINK_LIBRARIES( Two ) +LINK_LIBRARIES( Five ) ADD_LIBRARY( SixA SixASrc.c ) ADD_LIBRARY( SixB SixBSrc.c ) TARGET_LINK_LIBRARIES( SixB Four ) -LINK_LIBRARIES( Five ) |