VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-10-30 20:40:20 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1265 from srcejon/mac_package

Browse Source 
Add hidapi.dll to Windows installer
This commit is contained in:
Edouard Griffiths 2022-05-30 18:07:36 +02:00 committed by GitHub
commit 6ad6db3a0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -277,6 +277,7 @@ elseif (WIN32)
set(HIDAPI_FOUND ON CACHE INTERNAL "") set(HIDAPI_FOUND ON CACHE INTERNAL "")
set(HIDAPI_INCLUDE_DIRS "${EXTERNAL_LIBRARY_FOLDER}/hidapi/include" CACHE INTERNAL "") set(HIDAPI_INCLUDE_DIRS "${EXTERNAL_LIBRARY_FOLDER}/hidapi/include" CACHE INTERNAL "")
set(HIDAPI_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/hidapi/x64/hidapi.lib" CACHE INTERNAL "") set(HIDAPI_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/hidapi/x64/hidapi.lib" CACHE INTERNAL "")
set(HIDAPI_DLL_DIR "${EXTERNAL_LIBRARY_FOLDER}/hidapi/x64" CACHE INTERNAL "")
# used on fixup_bundle phase # used on fixup_bundle phase
set(WINDOWS_FIXUP_BUNDLE_LIB_DIRS set(WINDOWS_FIXUP_BUNDLE_LIB_DIRS

11
cmake/cpack/CMakeLists.txt
View File

@ -176,6 +176,14 @@ elseif(WIN32 OR MINGW)
) )
endforeach(codec2_dll) endforeach(codec2_dll)
file(GLOB HIDAPI_DLLS "${HIDAPI_DLL_DIR}/*${CMAKE_SHARED_LIBRARY_SUFFIX}")
foreach(hidapi_dll ${HIDAPI_DLLS})
get_filename_component(hidapi_dll_name "${hidapi_dll}" NAME)
add_custom_target(copy_hidapi_${hidapi_dll_name} ALL
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${hidapi_dll}" "${SDRANGEL_BINARY_BIN_DIR}/"
)
endforeach(hidapi_dll)
if(ENABLE_USRP AND UHD_FOUND) if(ENABLE_USRP AND UHD_FOUND)
file(GLOB UHD_DLLS "${UHD_DLL_DIR}/*${CMAKE_SHARED_LIBRARY_SUFFIX}") file(GLOB UHD_DLLS "${UHD_DLL_DIR}/*${CMAKE_SHARED_LIBRARY_SUFFIX}")
foreach(uhd_dll ${UHD_DLLS}) foreach(uhd_dll ${UHD_DLLS})
@ -248,6 +256,9 @@ elseif(WIN32 OR MINGW)
# codec2 # codec2
install(DIRECTORY "${CODEC2_DLL_DIR}/" DESTINATION "${INSTALL_LIB_DIR}" install(DIRECTORY "${CODEC2_DLL_DIR}/" DESTINATION "${INSTALL_LIB_DIR}"
FILES_MATCHING PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}") FILES_MATCHING PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}")
# hidapi
install(DIRECTORY "${HIDAPI_DLL_DIR}/" DESTINATION "${INSTALL_LIB_DIR}"
FILES_MATCHING PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}")
# uhd # uhd
install(DIRECTORY "${UHD_DLL_DIR}/" DESTINATION "${INSTALL_LIB_DIR}" install(DIRECTORY "${UHD_DLL_DIR}/" DESTINATION "${INSTALL_LIB_DIR}"
FILES_MATCHING PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}") FILES_MATCHING PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}")