Jelajahi Sumber

FIX: do not use CMAKE_CFG_INTDIR, just use LINK_DIRECTORIES

Sebastien Barre 23 tahun lalu
induk
melakukan
6d5bef7daf

+ 5 - 8
Tests/Complex/Executable/CMakeLists.txt

@@ -8,16 +8,14 @@ TARGET_LINK_LIBRARIES(complex ${COMPLEX_LIBS})
 
 #
 # Link to CMake lib
+# Specify the same one for debug/optimized to increase coverage
 #
-FIND_LIBRARY(CMAKE_LIB
-              CMakeLib 
-              ${Wrapping_BINARY_DIR}/../../Source/${CMAKE_CFG_INTDIR})
+LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source)
 
-# Specify the same one for debug/optimized to increase coverage
 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")
-

+ 5 - 8
Tests/ComplexOneConfig/Executable/CMakeLists.txt

@@ -8,16 +8,14 @@ TARGET_LINK_LIBRARIES(complex ${COMPLEX_LIBS})
 
 #
 # Link to CMake lib
+# Specify the same one for debug/optimized to increase coverage
 #
-FIND_LIBRARY(CMAKE_LIB
-              CMakeLib 
-              ${Wrapping_BINARY_DIR}/../../Source/${CMAKE_CFG_INTDIR})
+LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source)
 
-# Specify the same one for debug/optimized to increase coverage
 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")
-

+ 5 - 8
Tests/ComplexRelativePaths/Executable/CMakeLists.txt

@@ -8,16 +8,14 @@ TARGET_LINK_LIBRARIES(complex ${COMPLEX_LIBS})
 
 #
 # Link to CMake lib
+# Specify the same one for debug/optimized to increase coverage
 #
-FIND_LIBRARY(CMAKE_LIB
-              CMakeLib 
-              ${Wrapping_BINARY_DIR}/../../Source/${CMAKE_CFG_INTDIR})
+LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source)
 
-# Specify the same one for debug/optimized to increase coverage
 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")
-