From 86127093badf527d75ad462edb1f2c55d9f23e48 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Wed, 27 Sep 2023 16:47:44 +0200 Subject: [PATCH 1/3] drop atomic as we no longer need it as we droped boost::threads a long time ago --- CMakeLists.txt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 43bbcfc2e1..a18ef3d5ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -434,7 +434,7 @@ if(HAVE_MULTIVIEW) add_definitions(-DOSG_HAS_MULTIVIEW) endif(HAVE_MULTIVIEW) -set(BOOST_COMPONENTS system program_options iostreams) +set(BOOST_COMPONENTS iostreams program_options system) if(WIN32) set(BOOST_COMPONENTS ${BOOST_COMPONENTS} locale) if(MSVC) @@ -449,12 +449,9 @@ IF(BOOST_STATIC) endif() set(Boost_NO_BOOST_CMAKE ON) +set(Boost_NO_WARN_NEW_VERSIONS ON) # ignore warnings about new releases of boost -find_package(Boost 1.6.2 REQUIRED COMPONENTS ${BOOST_COMPONENTS} OPTIONAL_COMPONENTS ${BOOST_OPTIONAL_COMPONENTS}) - -if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.77.0) - find_package(Boost 1.77.0 REQUIRED COMPONENTS atomic) -endif() +find_package(Boost 1.77.0 REQUIRED COMPONENTS ${BOOST_COMPONENTS} OPTIONAL_COMPONENTS ${BOOST_OPTIONAL_COMPONENTS}) if(OPENMW_USE_SYSTEM_MYGUI) find_package(MyGUI 3.4.2 REQUIRED) From 2ac4cb6d58c5efdd1cc9e717c1bfdffb8be06edd Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Wed, 27 Sep 2023 16:49:24 +0200 Subject: [PATCH 2/3] 1.6.2 is old, but apparently still okay --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a18ef3d5ed..5d59e87344 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -451,7 +451,7 @@ endif() set(Boost_NO_BOOST_CMAKE ON) set(Boost_NO_WARN_NEW_VERSIONS ON) # ignore warnings about new releases of boost -find_package(Boost 1.77.0 REQUIRED COMPONENTS ${BOOST_COMPONENTS} OPTIONAL_COMPONENTS ${BOOST_OPTIONAL_COMPONENTS}) +find_package(Boost 1.6.2 REQUIRED COMPONENTS ${BOOST_COMPONENTS} OPTIONAL_COMPONENTS ${BOOST_OPTIONAL_COMPONENTS}) if(OPENMW_USE_SYSTEM_MYGUI) find_package(MyGUI 3.4.2 REQUIRED) From e9ff87b553972ea4fa6352564c2085ee85492f64 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Wed, 27 Sep 2023 17:13:02 +0200 Subject: [PATCH 3/3] bump macos to use boost 1.83 which solves issues --- CI/before_install.osx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index a467b589da..5b305d66b6 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -34,7 +34,7 @@ qmake --version if [[ "${MACOS_AMD64}" ]]; then curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20221113.zip -o ~/openmw-deps.zip else - curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20230722_arm64.zip -o ~/openmw-deps.zip + curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/macos/openmw-deps-20230920_arm64.zip -o ~/openmw-deps.zip fi unzip -o ~/openmw-deps.zip -d /tmp > /dev/null