diff options
Diffstat (limited to '')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 32cfa8580..9cc24cba6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -163,12 +163,6 @@ else() | |||
| 163 | set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /MANIFEST:NO /INCREMENTAL:NO /OPT:REF,ICF" CACHE STRING "" FORCE) | 163 | set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /MANIFEST:NO /INCREMENTAL:NO /OPT:REF,ICF" CACHE STRING "" FORCE) |
| 164 | endif() | 164 | endif() |
| 165 | 165 | ||
| 166 | # Fix GCC C++17 and Boost.ICL incompatibility (needed to build dynarmic) | ||
| 167 | # See https://bugzilla.redhat.com/show_bug.cgi?id=1485641#c1 | ||
| 168 | if (CMAKE_COMPILER_IS_GNUCC) | ||
| 169 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-new-ttp-matching") | ||
| 170 | endif() | ||
| 171 | |||
| 172 | # Set file offset size to 64 bits. | 166 | # Set file offset size to 64 bits. |
| 173 | # | 167 | # |
| 174 | # On modern Unixes, this is typically already the case. The lone exception is | 168 | # On modern Unixes, this is typically already the case. The lone exception is |
| @@ -185,9 +179,9 @@ set_property(DIRECTORY APPEND PROPERTY | |||
| 185 | # System imported libraries | 179 | # System imported libraries |
| 186 | # ====================== | 180 | # ====================== |
| 187 | 181 | ||
| 188 | find_package(Boost 1.63.0 QUIET) | 182 | find_package(Boost 1.64.0 QUIET) |
| 189 | if (NOT Boost_FOUND) | 183 | if (NOT Boost_FOUND) |
| 190 | message(STATUS "Boost 1.63.0 or newer not found, falling back to externals") | 184 | message(STATUS "Boost 1.64.0 or newer not found, falling back to externals") |
| 191 | 185 | ||
| 192 | set(BOOST_ROOT "${PROJECT_SOURCE_DIR}/externals/boost") | 186 | set(BOOST_ROOT "${PROJECT_SOURCE_DIR}/externals/boost") |
| 193 | set(Boost_NO_SYSTEM_PATHS OFF) | 187 | set(Boost_NO_SYSTEM_PATHS OFF) |