blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 18:30:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Workaround for Boost 1.78.0 log namespace change

Browse source
This commit is contained in:
Dan Paulat 2022-04-12 20:35:37 -05:00
parent a18db83730
commit ae886fd624
3 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scwx-qt/scwx-qt.cmake
View file

@ -206,6 +206,10 @@ qt6_create_translation_scwx(QM_FILES ${scwx-qt_SOURCE_DIR} ${TS_FILES})
if (WIN32) if (WIN32)
target_compile_definitions(scwx-qt PUBLIC WIN32_LEAN_AND_MEAN) target_compile_definitions(scwx-qt PUBLIC WIN32_LEAN_AND_MEAN)
target_compile_definitions(supercell-wx 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() endif()
target_include_directories(scwx-qt PUBLIC ${scwx-qt_SOURCE_DIR}/source target_include_directories(scwx-qt PUBLIC ${scwx-qt_SOURCE_DIR}/source

5
test/test.cmake
View file

@ -54,6 +54,11 @@ endif()
target_compile_definitions(wxtest PRIVATE SCWX_TEST_DATA_DIR="${SCWX_DIR}/test/data") 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) gtest_discover_tests(wxtest)
target_link_libraries(wxtest GTest::gtest target_link_libraries(wxtest GTest::gtest

3
wxdata/wxdata.cmake
View file

@ -198,6 +198,9 @@ target_link_libraries(wxdata INTERFACE Boost::iostreams
if (WIN32) if (WIN32)
target_link_libraries(wxdata INTERFACE Ws2_32) target_link_libraries(wxdata INTERFACE Ws2_32)
# For Boost::log
target_compile_definitions(wxdata PRIVATE BOOST_USE_WINAPI_VERSION=0x0601)
endif() endif()
set_target_properties(wxdata PROPERTIES CXX_STANDARD 20 set_target_properties(wxdata PROPERTIES CXX_STANDARD 20