From 32a2cfafd1967cdc40f173164c500558fb77176f Mon Sep 17 00:00:00 2001 From: BrodyHiggerson <7245990+BrodyHiggerson@users.noreply.github.com> Date: Wed, 24 Jul 2024 12:21:01 +1000 Subject: [PATCH] Re-added Boost build fixes after repo reorg --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 94ce30fd..b4b71e5a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,8 @@ endif() option(SFSE_SUPPORT_XBYAK "Enables trampoline support for Xbyak." OFF) option(SFSE_BUILD_TESTS "Builds the tests." OFF) +set(Boost_USE_STATIC_RUNTIME OFF CACHE BOOL "") + # info project( CommonLibSF @@ -22,6 +24,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON) set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_DEBUG OFF) set(CMAKE_OPTIMIZE_DEPENDENCIES ON) +set(Boost_USE_STATIC_LIBS ON) set_property(GLOBAL PROPERTY USE_FOLDERS ON) @@ -34,6 +37,7 @@ endif() # dependencies find_package(spdlog CONFIG REQUIRED) +find_package(boost MODULE REQUIRED) file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/include/*" @@ -49,6 +53,7 @@ function(configure_target TARGET_NAME) target_compile_definitions( ${TARGET_NAME} PUBLIC + BOOST_STL_INTERFACES_DISABLE_CONCEPTS WINVER=0x0A00 # windows 10, minimum supported version by starfield _WIN32_WINNT=0x0A00 "$<$:SFSE_SUPPORT_XBYAK=1>" @@ -110,6 +115,7 @@ function(configure_target TARGET_NAME) target_link_libraries( ${TARGET_NAME} PUBLIC + Boost::headers spdlog::spdlog Version.lib Dbghelp.lib