diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2017-04-04 07:15:34 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2017-04-06 04:21:40 +0200 |
| commit | 2d4570810c861606c38330d90137d856b8862d02 (patch) | |
| tree | a342a36d04cb271a36c7b738726afeb340b7183c | |
| parent | 90a8561b596c5e6d6c26ca24e1226fa1d7fefb88 (diff) | |
cmake: update few toolchain files
cf. https://github.com/opentrack/opentrack/issues/586#issuecomment-291313687
| -rw-r--r-- | cmake/apple.cmake | 4 | ||||
| -rw-r--r-- | cmake/linux.cmake | 4 | ||||
| -rw-r--r-- | cmake/mingw-w64.cmake | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cmake/apple.cmake b/cmake/apple.cmake index d3cc41eb..627ef3c1 100644 --- a/cmake/apple.cmake +++ b/cmake/apple.cmake @@ -1,12 +1,12 @@ set(CMAKE_BUILD_TYPE_INIT RELEASE) -set(CMAKE_CXX_FLAGS "-arch x86_64 -std=c++11 -stdlib=libc++" CACHE STRING "" FORCE) +set(CMAKE_CXX_FLAGS "-arch x86_64 -stdlib=libc++" CACHE STRING "" FORCE) set(CMAKE_C_FLAGS "-arch x86_64" CACHE STRING "" FORCE) set(CMAKE_C_FLAGS_RELEASE "-ffast-math -O3 -flto -fvisibility=hidden -g" CACHE STRING "" FORCE) set(CMAKE_CXX_FLAGS_RELEASE " ${CMAKE_C_FLAGS_RELEASE}" CACHE STRING "" FORCE) -set(cmake-link-common "-stdlib=libc++ -std=c++11 -arch x86_64") +set(cmake-link-common "-stdlib=libc++ -arch x86_64") set(CMAKE_EXE_LINKER_FLAGS "${cmake-link-common} -Wl,-stack_size,0x4000000" CACHE STRING "" FORCE) set(CMAKE_SHARED_LINKER_FLAGS ${cmake-link-common} CACHE STRING "" FORCE) set(CMAKE_MODULE_LINKER_FLAGS ${cmake-link-common} CACHE STRING "" FORCE) diff --git a/cmake/linux.cmake b/cmake/linux.cmake index a1083db5..945f7e77 100644 --- a/cmake/linux.cmake +++ b/cmake/linux.cmake @@ -1,6 +1,6 @@ set(CMAKE_BUILD_TYPE_INIT RELEASE) -set(CMAKE_CXX_FLAGS "-std=c++11 -fPIC" CACHE STRING "" FORCE) +set(CMAKE_CXX_FLAGS "-fPIC" CACHE STRING "" FORCE) set(CMAKE_C_FLAGS "-fPIC" CACHE STRING "" FORCE) set(CMAKE_AR "gcc-ar" CACHE STRING "" FORCE) @@ -10,7 +10,7 @@ set(CMAKE_RANLIB "gcc-ranlib" CACHE STRING "" FORCE) set(CMAKE_C_FLAGS_RELEASE "-ffast-math -O3 -flto -fuse-linker-plugin -fvisibility=hidden -fPIC" CACHE STRING "" FORCE) set(CMAKE_CXX_FLAGS_RELEASE " ${CMAKE_C_FLAGS_RELEASE} " CACHE STRING "" FORCE) -set(cmake-link-common "-std=c++11") +set(cmake-link-common "") set(CMAKE_EXE_LINKER_FLAGS "${cmake-link-common}" CACHE STRING "" FORCE) set(CMAKE_SHARED_LINKER_FLAGS ${cmake-link-common} CACHE STRING "" FORCE) set(CMAKE_MODULE_LINKER_FLAGS ${cmake-link-common} CACHE STRING "" FORCE) diff --git a/cmake/mingw-w64.cmake b/cmake/mingw-w64.cmake index 708c8905..0bdd8e3e 100644 --- a/cmake/mingw-w64.cmake +++ b/cmake/mingw-w64.cmake @@ -43,7 +43,7 @@ set(bloat "-fno-exceptions -fno-rtti") set(sections "-ffunction-sections -fdata-sections") set(ccflags-common "-fvisibility=hidden -pipe") -set(_CXXFLAGS "${bloat} ${ccflags-common} -std=c++11") +set(_CXXFLAGS "${bloat} ${ccflags-common}") set(_CFLAGS "${ccflags-common} -std=c11") set(_CFLAGS_RELEASE "-s ${cpu} ${fpu} ${lto} ${sections}") set(_CFLAGS_DEBUG "-g -O0 -fstack-protector-strong") |