diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2017-03-27 00:37:36 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2017-03-27 00:37:36 +0200 |
| commit | 92452240fb8fcb1f4dfded0cb2b2bf1ae8c33c79 (patch) | |
| tree | 11654630567837e6b123cbcd54680ed06e4aa06f /cmake | |
| parent | 87ec56fd4725007dea2875b796b635f722b62c7c (diff) | |
cmake: fix duplication of -DFOO on cmdline
Also /GR- doesn't belong here.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/opentrack-platform.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake index ce8341b1..721d5675 100644 --- a/cmake/opentrack-platform.cmake +++ b/cmake/opentrack-platform.cmake @@ -43,11 +43,11 @@ endif() if(MSVC) add_definitions(-DNOMINMAX -D_CRT_SECURE_NO_WARNINGS) add_definitions(-D_ITERATOR_DEBUG_LEVEL=0 -D_HAS_ITERATOR_DEBUGGING=0 -D_SECURE_SCL=0) - set(CMAKE_CXX_FLAGS " /GR- /std:c++14 -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS ${CMAKE_CXX_FLAGS} ") - set(CMAKE_C_FLAGS " -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS ${CMAKE_C_FLAGS} ") + set(CMAKE_CXX_FLAGS "-std:c++14 ${CMAKE_CXX_FLAGS}") + #set(CMAKE_C_FLAGS " -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS ${CMAKE_C_FLAGS} ") foreach (i SHARED MODULE EXE) - set(CMAKE_${i}_LINKER_FLAGS " /DYNAMICBASE /NXCOMPAT ${CMAKE_${i}_LINKER_FLAGS} ") + set(CMAKE_${i}_LINKER_FLAGS "-DYNAMICBASE -NXCOMPAT ${CMAKE_${i}_LINKER_FLAGS} ") endforeach() endif() @@ -119,6 +119,7 @@ function(fix_flags lang flag replacement) endif() endforeach() endfunction() + # nix -rdynamic passed from Linux-GNU.cmake if(CMAKE_COMPILER_IS_GNUCXX) set(__LINUX_COMPILER_GNU 1) |