Browse Source

Fix build with Boost 1.89.0

Laserlicht 2 months ago
parent
commit
62dc6bc6a3
2 changed files with 6 additions and 2 deletions
  1. 5 1
      CMakeLists.txt
  2. 1 1
      launcher/lib/innoextract

+ 5 - 1
CMakeLists.txt

@@ -468,11 +468,15 @@ endif()
 #        Finding packages                  #
 ############################################
 
-set(BOOST_COMPONENTS date_time filesystem locale program_options system)
+set(BOOST_COMPONENTS date_time filesystem locale program_options)
 if(ENABLE_INNOEXTRACT)
 	list(APPEND BOOST_COMPONENTS iostreams)
 endif()
 find_package(Boost 1.48.0 REQUIRED COMPONENTS ${BOOST_COMPONENTS})
+if(Boost_MAJOR_VERSION EQUAL 1 AND Boost_MINOR_VERSION LESS 69)
+	list(APPEND BOOST_COMPONENTS system)
+	find_package(Boost 1.48.0 REQUIRED COMPONENTS ${BOOST_COMPONENTS})
+endif()
 
 find_package(ZLIB REQUIRED)
 # Conan compatibility

+ 1 - 1
launcher/lib/innoextract

@@ -1 +1 @@
-Subproject commit 9977089412ebafe9f79936aa65a2edf16a84ae3e
+Subproject commit 98bb55798a77c0346b12a1dbb53fe4d3e0379d66