From 160357660358de16a8d826ad1b14ebbaa0ce8bab Mon Sep 17 00:00:00 2001 From: David Gräff Date: Thu, 20 Apr 2017 12:30:14 +1200 Subject: [PATCH] Use add_custom_command for copying win dlls to binary directory --- cmake/fftw_on_windows.cmake | 8 +++++++- cmake/libusb_on_windows.cmake | 9 +++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/cmake/fftw_on_windows.cmake b/cmake/fftw_on_windows.cmake index c9217d3..a663a68 100644 --- a/cmake/fftw_on_windows.cmake +++ b/cmake/fftw_on_windows.cmake @@ -43,5 +43,11 @@ CheckExitCodeAndExitIfError("lib") target_link_libraries(${PROJECT_NAME} "${CMAKE_BINARY_DIR}/fftw/libfftw3-3.lib") target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_BINARY_DIR}/fftw") -file(COPY "${CMAKE_BINARY_DIR}/fftw/libfftw3-3.dll" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/$/") file(COPY "${CMAKE_BINARY_DIR}/fftw/fftw3.h" DESTINATION "${CMAKE_SOURCE_DIR}/src") + +add_custom_command(TARGET ${PROJECT_NAME} + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_BINARY_DIR}/fftw/libfftw3-3.dll" $ + COMMENT "Copy fftw3 dlls for ${PROJECT_NAME}" +) + diff --git a/cmake/libusb_on_windows.cmake b/cmake/libusb_on_windows.cmake index 5c32ef5..254e665 100644 --- a/cmake/libusb_on_windows.cmake +++ b/cmake/libusb_on_windows.cmake @@ -26,6 +26,11 @@ else() endif() target_link_libraries(${PROJECT_NAME} "${LIBUSB_DIR}/${ARCH}/libusb-1.0.lib") -file(COPY "${LIBUSB_DIR}/${ARCH}/libusb-1.0.dll" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/$/") +target_include_directories(${PROJECT_NAME} PRIVATE "${LIBUSB_DIR}" "${LIBUSB_DIR}/libusb-1.0") + +add_custom_command(TARGET ${PROJECT_NAME} + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${LIBUSB_DIR}/${ARCH}/libusb-1.0.dll" $ + COMMENT "Copy libusb-1 dlls for ${PROJECT_NAME}" +) -include_directories("${LIBUSB_DIR}" "${LIBUSB_DIR}/libusb-1.0") -- libgit2 0.21.4