From 6d5bef7dafc392fe5a7dba6a9ebe29f7b7383951 Mon Sep 17 00:00:00 2001 From: Sebastien Barre Date: Wed, 27 Mar 2002 10:55:02 -0500 Subject: [PATCH] FIX: do not use CMAKE_CFG_INTDIR, just use LINK_DIRECTORIES --- Tests/Complex/Executable/CMakeLists.txt | 15 ++++++--------- Tests/ComplexOneConfig/Executable/CMakeLists.txt | 15 ++++++--------- .../Executable/CMakeLists.txt | 15 ++++++--------- 3 files changed, 18 insertions(+), 27 deletions(-) diff --git a/Tests/Complex/Executable/CMakeLists.txt b/Tests/Complex/Executable/CMakeLists.txt index c4d5f3c31..801c77728 100644 --- a/Tests/Complex/Executable/CMakeLists.txt +++ b/Tests/Complex/Executable/CMakeLists.txt @@ -8,16 +8,14 @@ TARGET_LINK_LIBRARIES(complex ${COMPLEX_LIBS}) # # Link to CMake lib -# -FIND_LIBRARY(CMAKE_LIB - CMakeLib - ${Wrapping_BINARY_DIR}/../../Source/${CMAKE_CFG_INTDIR}) - # Specify the same one for debug/optimized to increase coverage +# +LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source) + TARGET_LINK_LIBRARIES(complex - ${CMAKE_LIB} - debug ${CMAKE_LIB} - optimized ${CMAKE_LIB}) + CMakeLib + debug CMakeLib + optimized CMakeLib) # # Output the files required by 'complex' to a file. @@ -35,4 +33,3 @@ INSTALL_TARGETS(/tmp complex) INSTALL_PROGRAMS(/tmp complex) SOURCE_GROUP(A_GROUP ".cxx") - diff --git a/Tests/ComplexOneConfig/Executable/CMakeLists.txt b/Tests/ComplexOneConfig/Executable/CMakeLists.txt index c4d5f3c31..801c77728 100644 --- a/Tests/ComplexOneConfig/Executable/CMakeLists.txt +++ b/Tests/ComplexOneConfig/Executable/CMakeLists.txt @@ -8,16 +8,14 @@ TARGET_LINK_LIBRARIES(complex ${COMPLEX_LIBS}) # # Link to CMake lib -# -FIND_LIBRARY(CMAKE_LIB - CMakeLib - ${Wrapping_BINARY_DIR}/../../Source/${CMAKE_CFG_INTDIR}) - # Specify the same one for debug/optimized to increase coverage +# +LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source) + TARGET_LINK_LIBRARIES(complex - ${CMAKE_LIB} - debug ${CMAKE_LIB} - optimized ${CMAKE_LIB}) + CMakeLib + debug CMakeLib + optimized CMakeLib) # # Output the files required by 'complex' to a file. @@ -35,4 +33,3 @@ INSTALL_TARGETS(/tmp complex) INSTALL_PROGRAMS(/tmp complex) SOURCE_GROUP(A_GROUP ".cxx") - diff --git a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt index c4d5f3c31..801c77728 100644 --- a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt +++ b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt @@ -8,16 +8,14 @@ TARGET_LINK_LIBRARIES(complex ${COMPLEX_LIBS}) # # Link to CMake lib -# -FIND_LIBRARY(CMAKE_LIB - CMakeLib - ${Wrapping_BINARY_DIR}/../../Source/${CMAKE_CFG_INTDIR}) - # Specify the same one for debug/optimized to increase coverage +# +LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source) + TARGET_LINK_LIBRARIES(complex - ${CMAKE_LIB} - debug ${CMAKE_LIB} - optimized ${CMAKE_LIB}) + CMakeLib + debug CMakeLib + optimized CMakeLib) # # Output the files required by 'complex' to a file. @@ -35,4 +33,3 @@ INSTALL_TARGETS(/tmp complex) INSTALL_PROGRAMS(/tmp complex) SOURCE_GROUP(A_GROUP ".cxx") -