From ae886fd624af1010b37c61697362318a8baf6758 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Tue, 12 Apr 2022 20:35:37 -0500 Subject: [PATCH] Workaround for Boost 1.78.0 log namespace change --- scwx-qt/scwx-qt.cmake | 4 ++++ test/test.cmake | 5 +++++ wxdata/wxdata.cmake | 3 +++ 3 files changed, 12 insertions(+) diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake index a8f7911e..f1759304 100644 --- a/scwx-qt/scwx-qt.cmake +++ b/scwx-qt/scwx-qt.cmake @@ -206,6 +206,10 @@ qt6_create_translation_scwx(QM_FILES ${scwx-qt_SOURCE_DIR} ${TS_FILES}) if (WIN32) target_compile_definitions(scwx-qt PUBLIC WIN32_LEAN_AND_MEAN) target_compile_definitions(supercell-wx PUBLIC WIN32_LEAN_AND_MEAN) + + # For Boost::log + target_compile_definitions(scwx-qt PRIVATE BOOST_USE_WINAPI_VERSION=0x0601) + target_compile_definitions(supercell-wx PRIVATE BOOST_USE_WINAPI_VERSION=0x0601) endif() target_include_directories(scwx-qt PUBLIC ${scwx-qt_SOURCE_DIR}/source diff --git a/test/test.cmake b/test/test.cmake index 2820dc09..9525a4e6 100644 --- a/test/test.cmake +++ b/test/test.cmake @@ -54,6 +54,11 @@ endif() target_compile_definitions(wxtest PRIVATE SCWX_TEST_DATA_DIR="${SCWX_DIR}/test/data") +if (WIN32) + # For Boost::log + target_compile_definitions(wxtest PRIVATE BOOST_USE_WINAPI_VERSION=0x0601) +endif() + gtest_discover_tests(wxtest) target_link_libraries(wxtest GTest::gtest diff --git a/wxdata/wxdata.cmake b/wxdata/wxdata.cmake index a1dcdd8c..e23ef30e 100644 --- a/wxdata/wxdata.cmake +++ b/wxdata/wxdata.cmake @@ -198,6 +198,9 @@ target_link_libraries(wxdata INTERFACE Boost::iostreams if (WIN32) target_link_libraries(wxdata INTERFACE Ws2_32) + + # For Boost::log + target_compile_definitions(wxdata PRIVATE BOOST_USE_WINAPI_VERSION=0x0601) endif() set_target_properties(wxdata PROPERTIES CXX_STANDARD 20