diff --git a/CMakeLists.txt b/CMakeLists.txt index f357c83d..421baf96 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ add_compile_options( -ffunction-sections -fdata-sections -Wall - -std=c++11) + -std=c++14) file(GLOB_RECURSE yogacore_SRC yoga/*.cpp) add_library(yogacore STATIC ${yogacore_SRC}) @@ -28,7 +28,7 @@ if (ANDROID) target_link_libraries(yogacore android log) endif() -set_target_properties(yogacore PROPERTIES CXX_STANDARD 11) +set_target_properties(yogacore PROPERTIES CXX_STANDARD 14) # cmake install config include(GNUInstallDirs) diff --git a/Yoga.podspec b/Yoga.podspec index 077f6ccd..bbe0aabe 100644 --- a/Yoga.podspec +++ b/Yoga.podspec @@ -30,7 +30,7 @@ Pod::Spec.new do |spec| '-fexceptions', '-Wall', '-Werror', - '-std=c++1y', + '-std=c++14', '-fPIC' ] spec.source_files = 'yoga/**/*.{c,h,cpp}' diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt index 50b08cb9..f2ffa5ea 100644 --- a/java/CMakeLists.txt +++ b/java/CMakeLists.txt @@ -24,7 +24,7 @@ add_compile_options( -ffunction-sections -fdata-sections -Wall - -std=c++11) + -std=c++14) file(GLOB jni_SRC jni/*.cpp) diff --git a/javascript/CMakeLists.txt b/javascript/CMakeLists.txt index 1068ec89..18353807 100644 --- a/javascript/CMakeLists.txt +++ b/javascript/CMakeLists.txt @@ -14,7 +14,7 @@ file(GLOB SOURCES include_directories(..) -set(CXX_STANDARD, 11) +set(CXX_STANDARD, 14) add_compile_definitions( EMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0)