Sfoglia il codice sorgente

remoevd shared lib

Ken Martin 23 anni fa
parent
commit
cb57dd49c7

+ 1 - 14
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.

+ 1 - 14
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.

+ 1 - 14
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.