diff options
| author | Arnstein Ressem <aressem@gmail.com> | 2017-03-06 13:19:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-06 13:19:20 +0100 |
| commit | d863ca552374e3929cd2eeac041ee62b2cf8e7d5 (patch) | |
| tree | f1aa2c3b99b3d3e5800d1a8cbf54202de18e14fc | |
| parent | c7468a4fd6fc802b3f92d9b7b711777bac38f966 (diff) | |
| parent | 616ccffd3b8f7fe14d8eccd13d45bd81ddbce92e (diff) | |
Merge pull request #1938 from yahoo/aressem/add-cxx-extra-flags
Add possibility to add more CXX flags.
| -rw-r--r-- | build_settings.cmake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/build_settings.cmake b/build_settings.cmake index e73e2b3171f..8e97f1ba063 100644 --- a/build_settings.cmake +++ b/build_settings.cmake @@ -20,9 +20,8 @@ set(AUTORUN_UNIT_TESTS FALSE CACHE BOOL "If TRUE, tests will be run immediately set(WARN_OPTS "-Wuninitialized -Werror -Wall -W -Wchar-subscripts -Wcomment -Wformat -Wparentheses -Wreturn-type -Wswitch -Wtrigraphs -Wunused -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings") # C and C++ compiler flags -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3 ${WARN_OPTS} -fPIC -D_GLIBCXX_USE_CXX11_ABI=0 -DBOOST_DISABLE_ASSERTS -march=westmere -mtune=intel") - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS} -Wnon-virtual-dtor -fvisibility-inlines-hidden -fdiagnostics-color=auto") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3 ${WARN_OPTS} -fPIC -D_GLIBCXX_USE_CXX11_ABI=0 -DBOOST_DISABLE_ASSERTS -march=westmere -mtune=intel ${EXTRA_C_FLAGS}") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS} -Wnon-virtual-dtor -fvisibility-inlines-hidden -fdiagnostics-color=auto ${EXTRA_CXX_FLAGS}") # Linker flags set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--build-id -latomic -ldl -Wl,-E") |