diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f719beb7..a20f84eb8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,12 +34,12 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") # using GCC add_definitions(-DBUILD_DLL) add_compile_options(-Wall) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O2") elseif ("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin") # using GCC add_definitions(-DBUILD_DLL) add_compile_options(-Wall) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O2") set(CMAKE_MACOSX_RPATH ON) endif() diff --git a/Tests/googletest b/Tests/googletest index 8b6d3f9c4..b796f7d44 160000 --- a/Tests/googletest +++ b/Tests/googletest @@ -1 +1 @@ -Subproject commit 8b6d3f9c4a774bef3081195d422993323b6bb2e0 +Subproject commit b796f7d44681514f58a683a3a71ff17c94edb0c1