|
 |
2e267de |
--- CMakeLists.txt.orig 2018-12-18 14:48:48.000000000 -0700
|
|
|
2e267de |
+++ CMakeLists.txt 2018-12-24 14:34:21.698019713 -0700
|
|
|
2e267de |
@@ -193,8 +193,6 @@ if (ENABLE_ASSERTIONS)
|
|
|
6232da0 |
else()
|
|
|
6232da0 |
# Note this definition doesn't appear in the cache variables.
|
|
|
6232da0 |
add_definitions(-DNDEBUG)
|
|
|
6232da0 |
- add_cxx_flag_if_supported("-fno-stack-protector")
|
|
|
6232da0 |
- add_definitions(-D_FORTIFY_SOURCE=0)
|
|
|
6232da0 |
endif()
|
|
|
6232da0 |
|
|
|
6232da0 |
# Note: O3 gives slight speed increase, 1 more solved from SAT Comp'14 @ 3600s
|
|
|
2e267de |
@@ -300,14 +298,10 @@ if (NOT WIN32)
|
|
|
6232da0 |
if(CMAKE_BUILD_TYPE STREQUAL "Release")
|
|
|
6232da0 |
#add_cxx_flag_if_supported("-flto")
|
|
|
6232da0 |
else()
|
|
|
6232da0 |
- add_cxx_flag_if_supported("-mtune=native")
|
|
|
6232da0 |
add_cxx_flag_if_supported("-Wall")
|
|
|
6232da0 |
add_cxx_flag_if_supported("-Wextra")
|
|
|
6232da0 |
add_cxx_flag_if_supported("-Wunused")
|
|
|
6232da0 |
add_cxx_flag_if_supported("-Wsign-compare")
|
|
|
6232da0 |
- if (NOT CMAKE_BUILD_TYPE STREQUAL "Release")
|
|
|
6232da0 |
- add_cxx_flag_if_supported("-fno-omit-frame-pointer")
|
|
|
6232da0 |
- endif()
|
|
|
6232da0 |
add_cxx_flag_if_supported("-Wtype-limits")
|
|
|
6232da0 |
add_cxx_flag_if_supported("-Wuninitialized")
|
|
|
6232da0 |
add_cxx_flag_if_supported("-Wno-deprecated")
|
|
|
2e267de |
@@ -319,7 +313,6 @@ if (NOT WIN32)
|
|
|
6232da0 |
add_cxx_flag_if_supported("-Winit-self")
|
|
|
6232da0 |
add_cxx_flag_if_supported("-Wparentheses")
|
|
|
6232da0 |
add_cxx_flag_if_supported("-Wunreachable-code")
|
|
|
6232da0 |
- add_cxx_flag_if_supported("-ggdb3")
|
|
|
6232da0 |
|
|
|
2e267de |
# Apparently needed before OS X Maverics (2013)
|
|
|
2e267de |
#add_c_flag_if_supported("-stdlib=libc++")
|
|
|
2e267de |
@@ -342,10 +335,6 @@ endif()
|
|
|
6232da0 |
# -----------------------------------------------------------------------------
|
|
|
6232da0 |
# Uncomment these for static compilation under Linux (messes up Valgrind)
|
|
|
6232da0 |
# -----------------------------------------------------------------------------
|
|
|
6232da0 |
-if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND NOT SANITIZE)
|
|
|
6232da0 |
- set(CMAKE_EXE_LINKER_FLAGS " ${CMAKE_EXE_LINKER_FLAGS} -Wl,--discard-all -Wl,--build-id=sha1")
|
|
|
6232da0 |
-endif()
|
|
|
6232da0 |
-
|
|
|
6232da0 |
if ((${CMAKE_SYSTEM_NAME} MATCHES "Linux") OR (${CMAKE_SYSTEM_NAME} MATCHES "Darwin"))
|
|
|
2e267de |
if(NOT BUILD_SHARED_LIBS)
|
|
|
6232da0 |
MESSAGE(STATUS "Compiling for static library use")
|