summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-09-05 17:22:29 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-09-05 17:22:29 +0200
commitb77a3539a46f9ac8fc06ee701e00512aac4c7550 (patch)
tree9c5470a771ed6295875e9e5b5dd1313446f3974f
parent2ca5ae5fc7a0bf752dc22026b627c0a3a742270b (diff)
cmake: switch back to c++14
Lambdas with explicit return values are fun.
-rw-r--r--cmake/opentrack-platform.cmake2
-rw-r--r--proto-wine/CMakeLists.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake
index 0cb596a2..e112e86a 100644
--- a/cmake/opentrack-platform.cmake
+++ b/cmake/opentrack-platform.cmake
@@ -53,7 +53,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 780b1e16..3c1f4789 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})