diff --git a/Tests/Complex/Executable/CMakeLists.txt b/Tests/Complex/Executable/CMakeLists.txt index 2779fcb19..49d985899 100644 --- a/Tests/Complex/Executable/CMakeLists.txt +++ b/Tests/Complex/Executable/CMakeLists.txt @@ -19,10 +19,12 @@ TARGET_LINK_LIBRARIES(complex IF(WIN32) # we must copy the dll to the correct location FIND_FILE(CMAKE_DLL CMakeLib.dll ${Complex_BINARY_DIR}/../../Source ${Complex_BINARY_DIR}/../../Source/Debug) + FIND_FILE(CMAKE_DLL libCMakeLib.dll ${Complex_BINARY_DIR}/../../Source ${Complex_BINARY_DIR}/../../Source/Debug) + GET_FILENAME_COMPONENT(CMAKE_DLL_NAME ${CMAKE_DLL} NAME) IF (CMAKE_DLL) CONFIGURE_FILE( ${CMAKE_DLL} - ${Complex_BINARY_DIR}/bin/CMakeLib.dll COPYONLY) + ${Complex_BINARY_DIR}/bin/${CMAKE_DLL_NAME} COPYONLY) ENDIF (CMAKE_DLL) ENDIF (WIN32) diff --git a/Tests/ComplexOneConfig/Executable/CMakeLists.txt b/Tests/ComplexOneConfig/Executable/CMakeLists.txt index 2779fcb19..49d985899 100644 --- a/Tests/ComplexOneConfig/Executable/CMakeLists.txt +++ b/Tests/ComplexOneConfig/Executable/CMakeLists.txt @@ -19,10 +19,12 @@ TARGET_LINK_LIBRARIES(complex IF(WIN32) # we must copy the dll to the correct location FIND_FILE(CMAKE_DLL CMakeLib.dll ${Complex_BINARY_DIR}/../../Source ${Complex_BINARY_DIR}/../../Source/Debug) + FIND_FILE(CMAKE_DLL libCMakeLib.dll ${Complex_BINARY_DIR}/../../Source ${Complex_BINARY_DIR}/../../Source/Debug) + GET_FILENAME_COMPONENT(CMAKE_DLL_NAME ${CMAKE_DLL} NAME) IF (CMAKE_DLL) CONFIGURE_FILE( ${CMAKE_DLL} - ${Complex_BINARY_DIR}/bin/CMakeLib.dll COPYONLY) + ${Complex_BINARY_DIR}/bin/${CMAKE_DLL_NAME} COPYONLY) ENDIF (CMAKE_DLL) ENDIF (WIN32) diff --git a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt index 2779fcb19..49d985899 100644 --- a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt +++ b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt @@ -19,10 +19,12 @@ TARGET_LINK_LIBRARIES(complex IF(WIN32) # we must copy the dll to the correct location FIND_FILE(CMAKE_DLL CMakeLib.dll ${Complex_BINARY_DIR}/../../Source ${Complex_BINARY_DIR}/../../Source/Debug) + FIND_FILE(CMAKE_DLL libCMakeLib.dll ${Complex_BINARY_DIR}/../../Source ${Complex_BINARY_DIR}/../../Source/Debug) + GET_FILENAME_COMPONENT(CMAKE_DLL_NAME ${CMAKE_DLL} NAME) IF (CMAKE_DLL) CONFIGURE_FILE( ${CMAKE_DLL} - ${Complex_BINARY_DIR}/bin/CMakeLib.dll COPYONLY) + ${Complex_BINARY_DIR}/bin/${CMAKE_DLL_NAME} COPYONLY) ENDIF (CMAKE_DLL) ENDIF (WIN32)