diff options
| author | Janek Bevendorff <janek@jbev.net> | 2017-03-10 20:53:38 +0300 |
|---|---|---|
| committer | Janek Bevendorff <janek@jbev.net> | 2017-03-10 20:53:38 +0300 |
| commit | bb04144fe828ce5bf569ba7421be0146f2d8acc0 (patch) | |
| tree | 4ac977c0737656796019d70e6e060cf01f6556c4 /CMakeLists.txt | |
| parent | 429bef6830ef1d3695e7edbed1fca4a29b6a7de6 (diff) | |
| parent | 2f2f3e26c3964de864f2715142ffde29f9addbfd (diff) | |
Merge branch 'develop' into feature/yubikey
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index defb08ed5..ef1743df7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,12 +68,18 @@ endmacro(add_gcc_compiler_flags) add_definitions(-DQT_NO_EXCEPTIONS -DQT_STRICT_ITERATORS -DQT_NO_CAST_TO_ASCII) -add_gcc_compiler_flags("-fno-common -fstack-protector-strong --param=ssp-buffer-size=4") +add_gcc_compiler_flags("-fno-common") add_gcc_compiler_flags("-Wall -Wextra -Wundef -Wpointer-arith -Wno-long-long") add_gcc_compiler_flags("-Wformat=2 -Wmissing-format-attribute") add_gcc_compiler_flags("-fvisibility=hidden") add_gcc_compiler_cxxflags("-fvisibility-inlines-hidden") +if((CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.8.999) OR CMAKE_COMPILER_IS_CLANGXX) + add_gcc_compiler_flags("-fstack-protector-strong") +else() + add_gcc_compiler_flags("-fstack-protector --param=ssp-buffer-size=4") +endif() + add_gcc_compiler_cxxflags("-fno-exceptions -fno-rtti") add_gcc_compiler_cxxflags("-Wnon-virtual-dtor -Wold-style-cast -Woverloaded-virtual") add_gcc_compiler_cflags("-Wchar-subscripts -Wwrite-strings") |