Skip to content

Commit ddb976a

Browse files
committed
Updated to use VSG's CMake config for enable C++17
1 parent 6675075 commit ddb976a

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

CMakeLists.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.7)
1+
cmake_minimum_required(VERSION 3.10)
22

33
project(vsgExamples
44
VERSION 1.1.10
@@ -27,16 +27,13 @@ vsg_setup_dir_vars()
2727
vsg_setup_build_vars()
2828

2929
# find the optional vsgXchange that can be used for reading a range of image and 3d model formats and shader compilation
30-
find_package(vsgXchange 1.1.8 QUIET)
30+
find_package(vsgXchange 1.1.9 QUIET)
3131

3232
# find the optional vsgImGui that can be used for GUI elements added into graphics windows.
3333
find_package(vsgImGui QUIET)
3434

3535
find_package(Tracy QUIET)
3636

37-
# set the use of C++17 globally as all examples require it
38-
set(CMAKE_CXX_STANDARD 17)
39-
4037
if (MSVC)
4138
# MSVC assumes system-wide eight-bit code page (e.g. CP1252, CP1250) if there's no BOM
4239
add_compile_options("/utf-8")

examples/platform/vsgandroidnative/app/cpp/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ set(${CMAKE_C_FLAGS}, "${CMAKE_C_FLAGS}")
55
add_library(native_app_glue STATIC
66
${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c)
77

8-
# set the use of C++17
9-
set(CMAKE_CXX_STANDARD 17)
10-
118
# To prevent errors when loading the native activity, ensure library name is the same in debug builds
129
set(CMAKE_DEBUG_POSTFIX "")
1310

0 commit comments

Comments
 (0)