jasp-desktop: fix build with boost189 (#495961)

This commit is contained in:
Justin Bedő
2026-03-03 01:34:07 +00:00
committed by GitHub
3 changed files with 42 additions and 14 deletions
+41
View File
@@ -0,0 +1,41 @@
diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
index 4251554..1600f77 100644
--- a/Common/CMakeLists.txt
+++ b/Common/CMakeLists.txt
@@ -31,7 +31,6 @@ target_include_directories(
target_link_libraries(
Common
PUBLIC
- Boost::system
Boost::date_time
Boost::timer
Boost::chrono
diff --git a/Engine/CMakeLists.txt b/Engine/CMakeLists.txt
index f3a87e1..1949b2a 100644
--- a/Engine/CMakeLists.txt
+++ b/Engine/CMakeLists.txt
@@ -34,7 +34,6 @@ target_link_libraries(
QMLComponents
CommonData
Common
- Boost::system
Boost::date_time
Boost::timer
Boost::chrono
diff --git a/Tools/CMake/Libraries.cmake b/Tools/CMake/Libraries.cmake
index 3b950e1..149747b 100644
--- a/Tools/CMake/Libraries.cmake
+++ b/Tools/CMake/Libraries.cmake
@@ -67,11 +67,10 @@ if((NOT LibArchive_FOUND) AND (NOT WIN32))
endif()
endif()
-set(Boost_USE_STATIC_LIBS ON)
+add_definitions(-DBOOST_LOG_DYN_LINK)
find_package(
Boost 1.78 REQUIRED
COMPONENTS filesystem
- system
date_time
timer
chrono)
@@ -1,13 +0,0 @@
diff --git a/Tools/CMake/Libraries.cmake b/Tools/CMake/Libraries.cmake
index a6673d9..a079021 100644
--- a/Tools/CMake/Libraries.cmake
+++ b/Tools/CMake/Libraries.cmake
@@ -67,7 +67,7 @@ if((NOT LibArchive_FOUND) AND (NOT WIN32))
endif()
endif()
-set(Boost_USE_STATIC_LIBS ON)
+add_definitions(-DBOOST_LOG_DYN_LINK)
find_package(
Boost 1.78 REQUIRED
COMPONENTS filesystem
+1 -1
View File
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
};
patches = [
./link-boost-dynamically.patch
./boost.patch # link boost dynamically, don't try to link removed system stub library
./disable-module-install-logic.patch # don't try to install modules via cmake
./disable-renv-logic.patch
./dont-check-for-module-deps.patch # dont't check for dependencies required for building modules