diff --git a/Tests/Complex/Executable/CMakeLists.txt b/Tests/Complex/Executable/CMakeLists.txt
index 4d0e84596..c4d5f3c31 100644
--- a/Tests/Complex/Executable/CMakeLists.txt
+++ b/Tests/Complex/Executable/CMakeLists.txt
@@ -10,12 +10,8 @@ TARGET_LINK_LIBRARIES(complex ${COMPLEX_LIBS})
 # Link to CMake lib
 #
 FIND_LIBRARY(CMAKE_LIB
-             CMakeLib 
-             ${Complex_BINARY_DIR}/../../Source
-             ${Complex_BINARY_DIR}/../../Source/Debug
-             ${Complex_BINARY_DIR}/../../Source/Release
-             ${Complex_BINARY_DIR}/../../Source/MinSizeRel
-             ${Complex_BINARY_DIR}/../../Source/RelWithDebInfo)
+              CMakeLib 
+              ${Wrapping_BINARY_DIR}/../../Source/${CMAKE_CFG_INTDIR})
 
 # Specify the same one for debug/optimized to increase coverage
 TARGET_LINK_LIBRARIES(complex 
diff --git a/Tests/ComplexOneConfig/Executable/CMakeLists.txt b/Tests/ComplexOneConfig/Executable/CMakeLists.txt
index 4d0e84596..c4d5f3c31 100644
--- a/Tests/ComplexOneConfig/Executable/CMakeLists.txt
+++ b/Tests/ComplexOneConfig/Executable/CMakeLists.txt
@@ -10,12 +10,8 @@ TARGET_LINK_LIBRARIES(complex ${COMPLEX_LIBS})
 # Link to CMake lib
 #
 FIND_LIBRARY(CMAKE_LIB
-             CMakeLib 
-             ${Complex_BINARY_DIR}/../../Source
-             ${Complex_BINARY_DIR}/../../Source/Debug
-             ${Complex_BINARY_DIR}/../../Source/Release
-             ${Complex_BINARY_DIR}/../../Source/MinSizeRel
-             ${Complex_BINARY_DIR}/../../Source/RelWithDebInfo)
+              CMakeLib 
+              ${Wrapping_BINARY_DIR}/../../Source/${CMAKE_CFG_INTDIR})
 
 # Specify the same one for debug/optimized to increase coverage
 TARGET_LINK_LIBRARIES(complex 
diff --git a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt
index 4d0e84596..c4d5f3c31 100644
--- a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt
+++ b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt
@@ -10,12 +10,8 @@ TARGET_LINK_LIBRARIES(complex ${COMPLEX_LIBS})
 # Link to CMake lib
 #
 FIND_LIBRARY(CMAKE_LIB
-             CMakeLib 
-             ${Complex_BINARY_DIR}/../../Source
-             ${Complex_BINARY_DIR}/../../Source/Debug
-             ${Complex_BINARY_DIR}/../../Source/Release
-             ${Complex_BINARY_DIR}/../../Source/MinSizeRel
-             ${Complex_BINARY_DIR}/../../Source/RelWithDebInfo)
+              CMakeLib 
+              ${Wrapping_BINARY_DIR}/../../Source/${CMAKE_CFG_INTDIR})
 
 # Specify the same one for debug/optimized to increase coverage
 TARGET_LINK_LIBRARIES(complex 
diff --git a/Tests/Testing/CMakeLists.txt b/Tests/Testing/CMakeLists.txt
index f6fd4df0c..dac24e1ba 100644
--- a/Tests/Testing/CMakeLists.txt
+++ b/Tests/Testing/CMakeLists.txt
@@ -28,11 +28,7 @@ ENDIF (EXECUTABLE_OUTPUT_PATH)
 #
 FIND_LIBRARY(CMAKE_LIB
              CMakeLib 
-             ${Testing_BINARY_DIR}/../../Source
-             ${Testing_BINARY_DIR}/../../Source/Debug
-             ${Testing_BINARY_DIR}/../../Source/Release
-             ${Testing_BINARY_DIR}/../../Source/MinSizeRel
-             ${Testing_BINARY_DIR}/../../Source/RelWithDebInfo)
+             ${Wrapping_BINARY_DIR}/../../Source/${CMAKE_CFG_INTDIR})
 
 # Specify the same one for debug/optimized to increase coverage
 LINK_LIBRARIES(${CMAKE_LIB}
diff --git a/Tests/Wrapping/CMakeLists.txt b/Tests/Wrapping/CMakeLists.txt
index 1cc8b0e38..feca672c6 100644
--- a/Tests/Wrapping/CMakeLists.txt
+++ b/Tests/Wrapping/CMakeLists.txt
@@ -28,11 +28,7 @@ ENDIF (EXECUTABLE_OUTPUT_PATH)
 #
 FIND_LIBRARY (CMAKE_LIB
               CMakeLib 
-              ${Wrapping_BINARY_DIR}/../../Source
-              ${Wrapping_BINARY_DIR}/../../Source/Debug
-              ${Wrapping_BINARY_DIR}/../../Source/Release
-              ${Wrapping_BINARY_DIR}/../../Source/MinSizeRel
-              ${Wrapping_BINARY_DIR}/../../Source/RelWithDebInfo)
+              ${Wrapping_BINARY_DIR}/../../Source/${CMAKE_CFG_INTDIR})
 
 LINK_LIBRARIES (${CMAKE_LIB})
 
@@ -127,7 +123,7 @@ CONFIGURE_FILE(
 #
 # Mangled Mesa
 #
-USE_MANGLED_MESA (${Wrapping_SOURCE_DIR} ${Wrapping_BINARY_DIR}/mangled_mesa)
+USE_MANGLED_MESA (${Wrapping_BINARY_DIR} ${Wrapping_BINARY_DIR}/mangled_mesa)
 
 #
 # Instantiator