From 19b1ecd7c26f2311dd883b62a8b9c2dfca9ec31b Mon Sep 17 00:00:00 2001 From: vsonnier Date: Sun, 21 Mar 2021 10:56:31 +0100 Subject: [PATCH] Fixed CMake Win32/64 external binaries deployment --- CMakeLists.txt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b00cdb..82e78cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -680,6 +680,10 @@ IF (NOT BUNDLE_APP) configure_files(${PROJECT_SOURCE_DIR}/icon ${CMAKE_BINARY_DIR}/${EX_PLATFORM_NAME} CubicSDR.ico) IF(MSVC) configure_files(${PROJECT_SOURCE_DIR}/external/liquid-dsp/msvc/${EX_PLATFORM}/ ${CMAKE_BINARY_DIR}/${EX_PLATFORM_NAME} "*.dll") + configure_files(${PROJECT_SOURCE_DIR}/external/msvc/${EX_PLATFORM_NAME}/ ${CMAKE_BINARY_DIR}/${EX_PLATFORM_NAME} "*.dll") + IF(USE_HAMLIB) + configure_files(${PROJECT_SOURCE_DIR}/external/hamlib/${EX_PLATFORM}/ ${CMAKE_BINARY_DIR}/${EX_PLATFORM_NAME} "*.dll") + ENDIF(USE_HAMLIB) ENDIF() IF (CUBICSDR_HAS_HEADER_IMAGE) configure_files(${CUBICSDR_HEADER_IMAGE_DIR} ${CMAKE_BINARY_DIR}/${EX_PLATFORM_NAME} ${CUBICSDR_HEADER_IMAGE_FILE}) @@ -908,7 +912,7 @@ IF (WIN32 AND NOT BUILD_INSTALLER) IF(USE_HAMLIB) FOREACH(HAMLIB_DLL ${HAMLIB_DLLS}) message(STATUS "Copying Hamlib DLL: ${HAMLIB_DLL}") - INSTALL( FILES "${HAMLIB_DLL}" + INSTALL( FILES ${HAMLIB_DLL} DESTINATION bin ) ENDFOREACH() @@ -999,10 +1003,10 @@ IF (WIN32 AND BUILD_INSTALLER) install(FILES ${SOAPY_MODS} DESTINATION modules) ENDIF(BUNDLE_SOAPY_MODS) - IF(MSVC AND EX_PLATFORM EQUAL 32) - file(GLOB MSVC32_DEPS ${PROJECT_SOURCE_DIR}/external/msvc/${EX_PLATFORM_NAME}/*.dll) - install(FILES ${MSVC32_DEPS} DESTINATION .) - ENDIF(MSVC AND EX_PLATFORM EQUAL 32) + IF(MSVC) + file(GLOB MSVC_DEPS ${PROJECT_SOURCE_DIR}/external/msvc/${EX_PLATFORM_NAME}/*.dll) + install(FILES ${MSVC_DEPS} DESTINATION .) + ENDIF(MSVC) set(CPACK_PACKAGE_EXECUTABLES CubicSDR "CubicSDR")