octo
/
yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2241 from lioncash/compile-flags 

CMakeLists: Remove now-unnecessary GCC special-casing
This commit is contained in:
bunnei 2019-03-16 00:43:29 -04:00 committed by GitHub
parent bdf2da4ee8 e5b004e903
commit 29c242721a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -163,12 +163,6 @@ else()
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /MANIFEST:NO /INCREMENTAL:NO /OPT:REF,ICF" CACHE STRING "" FORCE) set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /MANIFEST:NO /INCREMENTAL:NO /OPT:REF,ICF" CACHE STRING "" FORCE)
endif() 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. # Set file offset size to 64 bits.
# #
# On modern Unixes, this is typically already the case. The lone exception is # 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 # System imported libraries
# ====================== # ======================
find_package(Boost 1.63.0 QUIET) find_package(Boost 1.64.0 QUIET)
if (NOT Boost_FOUND) 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_ROOT "${PROJECT_SOURCE_DIR}/externals/boost")
set(Boost_NO_SYSTEM_PATHS OFF) set(Boost_NO_SYSTEM_PATHS OFF)