diff options
| -rw-r--r-- | Tests/Complex/Executable/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | Tests/ComplexOneConfig/Executable/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | Tests/ComplexRelativePaths/Executable/CMakeLists.txt | 15 |
3 files changed, 3 insertions, 42 deletions
diff --git a/Tests/Complex/Executable/CMakeLists.txt b/Tests/Complex/Executable/CMakeLists.txt index 49d9858..886b91f 100644 --- a/Tests/Complex/Executable/CMakeLists.txt +++ b/Tests/Complex/Executable/CMakeLists.txt @@ -13,20 +13,7 @@ LINK_LIBRARIES(${COMPLEX_LIBS}) ADD_EXECUTABLE(complex complex) -TARGET_LINK_LIBRARIES(complex - CMakeLib) - -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/${CMAKE_DLL_NAME} COPYONLY) - ENDIF (CMAKE_DLL) -ENDIF (WIN32) +TARGET_LINK_LIBRARIES(complex 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 49d9858..886b91f 100644 --- a/Tests/ComplexOneConfig/Executable/CMakeLists.txt +++ b/Tests/ComplexOneConfig/Executable/CMakeLists.txt @@ -13,20 +13,7 @@ LINK_LIBRARIES(${COMPLEX_LIBS}) ADD_EXECUTABLE(complex complex) -TARGET_LINK_LIBRARIES(complex - CMakeLib) - -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/${CMAKE_DLL_NAME} COPYONLY) - ENDIF (CMAKE_DLL) -ENDIF (WIN32) +TARGET_LINK_LIBRARIES(complex 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 49d9858..886b91f 100644 --- a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt +++ b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt @@ -13,20 +13,7 @@ LINK_LIBRARIES(${COMPLEX_LIBS}) ADD_EXECUTABLE(complex complex) -TARGET_LINK_LIBRARIES(complex - CMakeLib) - -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/${CMAKE_DLL_NAME} COPYONLY) - ENDIF (CMAKE_DLL) -ENDIF (WIN32) +TARGET_LINK_LIBRARIES(complex CMakeLib) # # Output the files required by 'complex' to a file. |