Fix Windows

This commit is contained in:
Jamie Vital 2024-05-20 21:21:27 -04:00
parent 59380c0ca0
commit cbfeadfc2f
3 changed files with 12 additions and 3 deletions

View file

@ -269,7 +269,6 @@ if((NOT ANDROID) AND ENABLE_INSTALL)
endif()
file(GLOB_RECURSE SATDUMP_WINDOWS_DEPENDENCIES ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/installed/x64-windows/bin/*.dll)
install(FILES ${SATDUMP_WINDOWS_DEPENDENCIES} DESTINATION bin)
install(TARGETS satdump_core DESTINATION bin)
else()
set(CPACK_GENERATOR DEB)
#set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)

View file

@ -186,6 +186,12 @@ if(APPLE)
target_link_libraries(satdump_core PUBLIC "-framework CoreGraphics")
endif()
install(TARGETS satdump_core DESTINATION lib)
# Install
if(MSVC OR BUILD_MSVC)
install(TARGETS satdump_core DESTINATION bin)
else()
install(TARGETS satdump_core DESTINATION lib)
endif()
install(DIRECTORY . DESTINATION include/satdump FILES_MATCHING PATTERN "*.h")
install(DIRECTORY . DESTINATION include/satdump FILES_MATCHING PATTERN "*.hpp")

View file

@ -18,4 +18,8 @@ endif()
target_link_libraries(satdump_interface PUBLIC satdump_core)
# Install
install(TARGETS satdump_interface DESTINATION lib)
if(MSVC OR BUILD_MSVC)
install(TARGETS satdump_interface DESTINATION bin)
else()
install(TARGETS satdump_interface DESTINATION lib)
endif()