summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--cmake/apple.cmake4
-rw-r--r--cmake/linux.cmake4
-rw-r--r--cmake/opentrack-platform.cmake2
-rw-r--r--proto-wine/CMakeLists.txt2
4 files changed, 6 insertions, 6 deletions
diff --git a/cmake/apple.cmake b/cmake/apple.cmake
index d3cc41eb..2a4b49d0 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 -std=c++14 -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++ -std=c++14 -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..520db1a9 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 "-std=c++14 -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 "-std=c++14")
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/opentrack-platform.cmake b/cmake/opentrack-platform.cmake
index 23558981..7357a987 100644
--- a/cmake/opentrack-platform.cmake
+++ b/cmake/opentrack-platform.cmake
@@ -51,7 +51,7 @@ if(APPLE)
endif()
if(CMAKE_COMPILER_IS_GNUCXX OR APPLE)
- set(CMAKE_CXX_FLAGS " -std=c++11 ${CMAKE_CXX_FLAGS} ")
+ set(CMAKE_CXX_FLAGS " -std=c++14 ${CMAKE_CXX_FLAGS} ")
endif()
set_property(GLOBAL PROPERTY USE_FOLDERS OFF)
diff --git a/proto-wine/CMakeLists.txt b/proto-wine/CMakeLists.txt
index e2576061..01034e30 100644
--- a/proto-wine/CMakeLists.txt
+++ b/proto-wine/CMakeLists.txt
@@ -14,7 +14,7 @@ if(NOT WIN32)
add_custom_command(
OUTPUT opentrack-wrapper-wine.exe.so
DEPENDS ${wine-deps}
- COMMAND ${SDK_WINE_PREFIX}/bin/wineg++ -g -DNOMINMAX -O2 -m32 -std=c++11 -o
+ COMMAND ${SDK_WINE_PREFIX}/bin/wineg++ -g -DNOMINMAX -O2 -m32 -std=c++14 -o
opentrack-wrapper-wine.exe -I "${CMAKE_SOURCE_DIR}" -I "${CMAKE_BINARY_DIR}"
${wine-deps}
${my-rt})