Skip to content

Fix build using newest gcc(10/11) with new msys/mingw toolchains #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sebres wants to merge 2 commits into
base: master
Choose a base branch
from
+21 −17
Open

Fix build using newest gcc(10/11) with new msys/mingw toolchains #333

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8306d2f
cmake/boost.cmake: fixes search path for (linked) boost package if bu…
sebres Oct 15, 2021
f65a193
support newest mingw toolchain (gcc 10/11), _WIN32 is not a sign of M…
sebres Oct 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
cmake/boost.cmake: fixes search path for (linked) boost package if bu… 
…ild in sub-directory (take a look into `include/boost` before `include`);

otherwise `cd build/Release_x64; cmake -S ../.. -B .` may fail, because it cannot find linked boost folder.
  • Loading branch information
@sebres
sebres committed Oct 15, 2021
commit 8306d2fc67b31aa36df2cb3e4fde3f9907330b9e
6 changes: 5 additions & 1 deletion cmake/boost.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,19 @@ set(BOOST_NO_BOOST_CMAKE ON)

unset(Boost_INCLUDE_DIR CACHE)
# we might have boost in tree, so provide a hint and try again
set(BOOST_INCLUDEDIR "${PROJECT_SOURCE_DIR}/include")
set(BOOST_INCLUDEDIR "${PROJECT_SOURCE_DIR}/include/boost")
find_package(Boost ${BOOST_MINVERSION} QUIET)
if(NOT Boost_FOUND)
set(BOOST_INCLUDEDIR "${PROJECT_SOURCE_DIR}/include")
find_package(Boost ${BOOST_MINVERSION} QUIET)
if(NOT Boost_FOUND)
# otherwise check for Boost installed on the system
unset(BOOST_INCLUDEDIR)
find_package(Boost ${BOOST_MINVERSION} QUIET)
if(NOT Boost_FOUND)
message(FATAL_ERROR "Boost ${BOOST_MINVERSION} or later not found. Either install system packages if available, extract Boost headers to ${CMAKE_SOURCE_DIR}/include, or set the CMake BOOST_ROOT variable.")
endif()
endif()
endif()

message(STATUS "Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
Expand Down