Skip to content

Commit fad05fd

Browse files
tianjianjiangclaude
andcommitted
build(engine): enforce C++17 in CMake and fix Data target standard
- Add CMAKE_CXX_STANDARD_REQUIRED ON and CMAKE_CXX_EXTENSIONS OFF to all three CMakeLists.txt files (Engine, gramambular2, Mandarin) - Change Data target from gnu++0x (C++11) to c++17 in both Debug and Release configurations in project.pbxproj Co-Authored-By: Claude Opus 4.6 <[email protected]>
1 parent fe48e62 commit fad05fd

4 files changed

Lines changed: 8 additions & 2 deletions

File tree

McBopomofo.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1167,7 +1167,7 @@
11671167
isa = XCBuildConfiguration;
11681168
buildSettings = {
11691169
ALWAYS_SEARCH_USER_PATHS = NO;
1170-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
1170+
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
11711171
CLANG_ENABLE_OBJC_WEAK = YES;
11721172
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
11731173
COMBINE_HIDPI_IMAGES = YES;
@@ -1201,7 +1201,7 @@
12011201
isa = XCBuildConfiguration;
12021202
buildSettings = {
12031203
ALWAYS_SEARCH_USER_PATHS = NO;
1204-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
1204+
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
12051205
CLANG_ENABLE_OBJC_WEAK = YES;
12061206
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
12071207
COMBINE_HIDPI_IMAGES = YES;

Source/Engine/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.6)
22
project(McBopomofoLMLib)
33

44
set(CMAKE_CXX_STANDARD 17)
5+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
6+
set(CMAKE_CXX_EXTENSIONS OFF)
57
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
68

79
add_subdirectory(gramambular2)

Source/Engine/Mandarin/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.6)
22
project(Mandarin)
33

44
set(CMAKE_CXX_STANDARD 17)
5+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
6+
set(CMAKE_CXX_EXTENSIONS OFF)
57
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
68

79
add_library(MandarinLib Mandarin.h Mandarin.cpp)

Source/Engine/gramambular2/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.6)
22
project(gramambular2)
33

44
set(CMAKE_CXX_STANDARD 17)
5+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
6+
set(CMAKE_CXX_EXTENSIONS OFF)
57
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
68

79
add_library(gramambular2_lib language_model.h reading_grid.h reading_grid.cpp)

0 commit comments

Comments
 (0)