From e5b004e9037359818ecc5a1d679c8d19d4a801b0 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 15 Mar 2019 20:49:55 -0400 Subject: [PATCH] CMakeLists: Remove now-unnecessary GCC special-casing This issue has since been fixed in newer versions of Boost, so we don't need to worry about this anymore. --- CMakeLists.txt | 10 ++-------- 1 file 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() set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /MANIFEST:NO /INCREMENTAL:NO /OPT:REF,ICF" CACHE STRING "" FORCE) endif() -# Fix GCC C++17 and Boost.ICL incompatibility (needed to build dynarmic) -# See https://bugzilla.redhat.com/show_bug.cgi?id=1485641#c1 -if (CMAKE_COMPILER_IS_GNUCC) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-new-ttp-matching") -endif() - # Set file offset size to 64 bits. # # On modern Unixes, this is typically already the case. The lone exception is @@ -185,9 +179,9 @@ set_property(DIRECTORY APPEND PROPERTY # System imported libraries # ====================== -find_package(Boost 1.63.0 QUIET) +find_package(Boost 1.64.0 QUIET) if (NOT Boost_FOUND) - message(STATUS "Boost 1.63.0 or newer not found, falling back to externals") + message(STATUS "Boost 1.64.0 or newer not found, falling back to externals") set(BOOST_ROOT "${PROJECT_SOURCE_DIR}/externals/boost") set(Boost_NO_SYSTEM_PATHS OFF)