Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch to C++17 (#2940)

Browse Source
This commit is contained in:
Ben Doherty
2020-08-12 15:21:39 -07:00
committed by GitHub
parent a0a8d62587
commit faa785f3f6
8 changed files with 62 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/filamat/CMakeLists.txt
+2 -2
View File
@@ -30,9 +30,9 @@ set(TARGET filamat-jni)
include_directories(${JNI_INCLUDE_DIRS})
set(CXX_STANDARD "-std=c++14")
set(CXX_STANDARD "-std=c++17")
if (WIN32)
set(CXX_STANDARD "/std:c++14")
set(CXX_STANDARD "/std:c++17")
endif()
set(FILAMAT_DIR ../../android/filamat-android)
java/filament/CMakeLists.txt
+2 -2
View File
@@ -28,9 +28,9 @@ endif()
# ==================================================================================================
set(TARGET filament-jni)
set(CXX_STANDARD "-std=c++14")
set(CXX_STANDARD "-std=c++17")
if (WIN32)
set(CXX_STANDARD "/std:c++14")
set(CXX_STANDARD "/std:c++17")
endif()
set(ANDROID_DIR ../../android)
java/gltfio/CMakeLists.txt
+2 -2
View File
@@ -28,9 +28,9 @@ endif()
# ==================================================================================================
set(TARGET gltfio-jni)
set(CXX_STANDARD "-std=c++14")
set(CXX_STANDARD "-std=c++17")
if (WIN32)
set(CXX_STANDARD "/std:c++14")
set(CXX_STANDARD "/std:c++17")
endif()
set(ANDROID_DIR ../../android)