From 8e3576022a327c68c053f1869ff44997262aedd6 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Tue, 25 Apr 2023 21:27:17 +0200 Subject: [PATCH] Don't install boost-filesystem anymore --- CI/before_script.msvc.sh | 4 ++-- CI/install_debian_deps.sh | 3 +-- CMakeLists.txt | 2 +- docker/Dockerfile.ubuntu | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh index 359cb01cd8..5b79f4304d 100644 --- a/CI/before_script.msvc.sh +++ b/CI/before_script.msvc.sh @@ -857,9 +857,9 @@ printf "${OSG_ARCHIVE_NAME}... " "$(pwd)/OSG/bin/osg"{,Animation,DB,FX,GA,Particle,Text,Util,Viewer,Shadow,Sim}${SUFFIX}.dll add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/icudt58.dll" if [ $CONFIGURATION == "Debug" ]; then - add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{boost_filesystem-vc141-mt-gd-1_63,boost_system-vc141-mt-gd-1_63,collada-dom2.4-dp-vc141-mt-d}.dll + add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{boost_system-vc141-mt-gd-1_63,collada-dom2.4-dp-vc141-mt-d}.dll else - add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{boost_filesystem-vc141-mt-1_63,boost_system-vc141-mt-1_63,collada-dom2.4-dp-vc141-mt}.dll + add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{boost_system-vc141-mt-1_63,collada-dom2.4-dp-vc141-mt}.dll fi fi add_osg_dlls $CONFIGURATION "$(pwd)/OSG/bin/osgPlugins-3.6.5/osgdb_"{bmp,dae,dds,freetype,jpeg,osg,png,tga}${SUFFIX}.dll diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh index 48b28d25e0..28f1c15c36 100755 --- a/CI/install_debian_deps.sh +++ b/CI/install_debian_deps.sh @@ -29,7 +29,7 @@ declare -rA GROUPED_DEPS=( # Common dependencies for building OpenMW. [openmw-deps]=" - libboost-filesystem-dev libboost-program-options-dev + libboost-program-options-dev libboost-system-dev libboost-iostreams-dev libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev @@ -66,7 +66,6 @@ declare -rA GROUPED_DEPS=( libavcodec58 libavformat58 libavutil56 - libboost-filesystem1.74.0 libboost-iostreams1.74.0 libboost-program-options1.74.0 libboost-system1.74.0 diff --git a/CMakeLists.txt b/CMakeLists.txt index 8bbd5cace7..0adffa61da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -452,7 +452,7 @@ if(HAVE_MULTIVIEW) add_definitions(-DOSG_HAS_MULTIVIEW) endif(HAVE_MULTIVIEW) -set(BOOST_COMPONENTS system filesystem program_options iostreams) +set(BOOST_COMPONENTS system program_options iostreams) if(WIN32) set(BOOST_COMPONENTS ${BOOST_COMPONENTS} locale) if(MSVC) diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu index b5fadff3e3..55f8d2e3a0 100644 --- a/docker/Dockerfile.ubuntu +++ b/docker/Dockerfile.ubuntu @@ -11,7 +11,7 @@ RUN apt-get update \ && apt-get install -y --no-install-recommends git build-essential cmake \ libopenal-dev libopenscenegraph-dev libbullet-dev libsdl2-dev \ libmygui-dev libunshield-dev liblz4-dev libtinyxml-dev libqt5opengl5-dev \ - libboost-filesystem-dev libboost-program-options-dev libboost-iostreams-dev \ + libboost-program-options-dev libboost-iostreams-dev \ libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev \ librecast-dev libsqlite3-dev libluajit-5.1-dev