From cbfeadfc2f036afe7fbf5830da486db90fde1862 Mon Sep 17 00:00:00 2001 From: Jamie Vital Date: Mon, 20 May 2024 21:21:27 -0400 Subject: [PATCH] Fix Windows --- CMakeLists.txt | 1 - src-core/CMakeLists.txt | 8 +++++++- src-interface/CMakeLists.txt | 6 +++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d4fb8a85..682aa363f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/src-core/CMakeLists.txt b/src-core/CMakeLists.txt index e17d8b39a..8af22c6fb 100644 --- a/src-core/CMakeLists.txt +++ b/src-core/CMakeLists.txt @@ -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") diff --git a/src-interface/CMakeLists.txt b/src-interface/CMakeLists.txt index f6d06f9a0..03de670c3 100644 --- a/src-interface/CMakeLists.txt +++ b/src-interface/CMakeLists.txt @@ -18,4 +18,8 @@ endif() target_link_libraries(satdump_interface PUBLIC satdump_core) # Install -install(TARGETS satdump_interface DESTINATION lib) \ No newline at end of file +if(MSVC OR BUILD_MSVC) + install(TARGETS satdump_interface DESTINATION bin) +else() + install(TARGETS satdump_interface DESTINATION lib) +endif() \ No newline at end of file