diff options
| author | Andres Noetzli <andres.noetzli@gmail.com> | 2021-07-02 00:42:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-02 07:42:13 +0000 |
| commit | 0711fcae88bc15b8d326dcd19802350051bba181 (patch) | |
| tree | a8e46938aa6e8d4a9284e424614baa7bdaa19743 /cmake | |
| parent | f0084555f6a9781dc0238d6a96b10e88ca56cc50 (diff) | |
Fix CaDiCaL auto-download on macOS (#6828)
* Fix CaDiCaL auto-download on macOS
If we are auto-downloading CaDiCaL, we are manually instantiating its makefile.
To do that, we use `CMAKE_CXX_COMPILER` for the compiler and assemble some
flags. However, we are missing the platform dependent flags. Specifically, we
need to set `-isysroot` on macOS to make sure that the header files are found
because they are not at /usr/include on newer versions of Apple's XCode [0].
Unfortunately, I could not find a CMake variable with the platform specific
flags. They are assembled here [1]. To solve this problem, the commit checks if
`CMAKE_OSX_SYSROOT` is set and adds a corresponding compiler flag if it is.
[0] https://developer.apple.com/documentation/xcode-release-notes/xcode-10-release-notes
[1] https://github.com/Kitware/CMake/blob/d60d6c269ae7ad15adbb82028e9ab50290db2a2b/Source/cmLocalGenerator.cxx#L1900-L1923
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindCaDiCaL.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cmake/FindCaDiCaL.cmake b/cmake/FindCaDiCaL.cmake index 2fe65cf8b..f0e0f5652 100644 --- a/cmake/FindCaDiCaL.cmake +++ b/cmake/FindCaDiCaL.cmake @@ -56,7 +56,13 @@ if(NOT CaDiCaL_FOUND_SYSTEM) # check for getc_unlocked check_symbol_exists("getc_unlocked" "cstdio" HAVE_UNLOCKED_IO) if(NOT HAVE_UNLOCKED_IO) - set(CXXFLAGS "${CXXFLAGS} -DNUNLOCKED") + string(APPEND CXXFLAGS " -DNUNLOCKED") + endif() + + # On macOS, we have to set `-isysroot` to make sure that include headers are + # found because they are not necessarily installed at /usr/include anymore. + if(CMAKE_OSX_SYSROOT) + string(APPEND CXXFLAGS " ${CMAKE_CXX_SYSROOT_FLAG} ${CMAKE_OSX_SYSROOT}") endif() if("${CMAKE_GENERATOR}" STREQUAL "Unix Makefiles") |