From 0141639b7afdda36b8450c145cf048491ad80061 Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 4 Nov 2021 05:25:14 +0100 Subject: [PATCH] Added fftw3f-wisdom exe to CPack Windows bundle --- CMakeLists.txt | 1 + cmake/cpack/CMakeLists.txt | 1 + external/windows | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a1ba0484f..48f60fcdc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -211,6 +211,7 @@ elseif (WIN32) set(FFTW3F_FOUND ON CACHE INTERNAL "") set(FFTW3F_INCLUDE_DIRS "${EXTERNAL_LIBRARY_FOLDER}/fftw-3/include" CACHE INTERNAL "") set(FFTW3F_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/fftw-3/libfftw3f-3.lib" CACHE INTERNAL "") + set(FFTW3F_WISDOM "${EXTERNAL_LIBRARY_FOLDER}/fftw-3/fftwf-wisdom.exe" CACHE INTERNAL "") set(LIBUSB_INCLUDE_DIR "${EXTERNAL_LIBRARY_FOLDER}/libusb/include" CACHE INTERNAL "") set(LIBUSB_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/libusb/MS64/dll/libusb-1.0.lib" CACHE INTERNAL "") if(VS2019) diff --git a/cmake/cpack/CMakeLists.txt b/cmake/cpack/CMakeLists.txt index 986d25b91..13e5c7ec2 100644 --- a/cmake/cpack/CMakeLists.txt +++ b/cmake/cpack/CMakeLists.txt @@ -262,6 +262,7 @@ elseif(WIN32 OR MINGW) include(BundleUtilities) fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/sdrangel${CMAKE_EXECUTABLE_SUFFIX}\" \"\" \"${WINDOWS_FIXUP_BUNDLE_LIB_DIRS}\") " COMPONENT Runtime) + install(FILES "${FFTW3F_WISDOM}" DESTINATION "${INSTALL_BIN_DIR}") elseif(BUILD_SERVER) install(CODE " include(BundleUtilities) diff --git a/external/windows b/external/windows index f20b21d50..60c75e6ad 160000 --- a/external/windows +++ b/external/windows @@ -1 +1 @@ -Subproject commit f20b21d50f9ef3930f6979759adc5af32f65c92a +Subproject commit 60c75e6ad9066a80e49b333cc3e236ae1475059f