Merge pull request #8 from OpenRCT2/cpp20

Compile source as C++20

Author: AaronVanGeffen

CMakeLists.txt

@@ -13,7 +13,13 @@ option(ENABLE_TESTS  "Build the unit tests for the library." ON)
 project(sawyer CXX)
 enable_testing()
 
-set(CMAKE_CXX_STANDARD 17)
+if (MSVC)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /std:c++20 /utf-8 /Zc:char8_t- /WX")
+    add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
+else ()
+    set(CMAKE_CXX_STANDARD 20)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-char8_t -Wno-deprecated-declarations")
+endif ()
 
 file(GLOB_RECURSE SAWYER_SOURCES "src/*.cpp")
 file(GLOB_RECURSE SAWYER_HEADERS "src/*.h" "src/*.hpp")
@@ -34,13 +40,6 @@ if (ENABLE_LIBPNG)
     endif ()
 endif ()
 
-if (MSVC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /std:c++17 /utf-8 /WX")
-    add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
-else ()
-
-endif ()
-
 # set_target_properties(sawyer PROPERTIES PUBLIC_HEADER "src/SawyerStream.h;src\\thirdparty/span.hpp")
 
 string(TOUPPER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_UPPER)

tools/fsaw/CMakeLists.txt

@@ -1,14 +1,15 @@
 cmake_minimum_required(VERSION 3.15)
 project(fsaw CXX)
 
-set(CMAKE_CXX_STANDARD 17)
+find_package(sawyer REQUIRED PATHS ../../out/share)
 
 file(GLOB_RECURSE SAWYER_SOURCES "src/*.cpp")
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /std:c++17 /utf-8 /WX")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /std:c++20 /utf-8 /Zc:char8_t- /WX")
 else ()
-
+    set(CMAKE_CXX_STANDARD 20)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-char8_t -Wno-deprecated-declarations")
 endif ()
 
 # libsawyer

tools/gxc/CMakeLists.txt

@@ -1,16 +1,15 @@
 cmake_minimum_required(VERSION 3.15)
 project(gxc CXX)
 
-set(CMAKE_CXX_STANDARD 17)
-
 file(GLOB_RECURSE SAWYER_SOURCES "src/*.cpp")
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /std:c++17 /utf-8 /WX")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /std:c++20 /utf-8 /Zc:char8_t- /WX")
 else ()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libstdc++")
+    set(CMAKE_CXX_STANDARD 20)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libstdc++ -fno-char8_t -Wno-deprecated-declarations")
     if (EXISTS "/etc/alpine-release")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libstdc++ -static-libgcc")
     endif()
 endif ()
 

tools/gxc/vcpkg.json

@@ -4,5 +4,13 @@
     "dependencies": [
         "libpng",
         "nlohmann-json"
-    ]
+    ],
+    "overrides": [
+        {
+            "name": "nlohmann-json",
+            "$explanation": "3.12.0 contains a major issue related to utf8 strings. Should be fixed when 3.12.1 releases",
+            "version": "3.11.3#1"
+        }
+    ],
+    "builtin-baseline": "120deac3062162151622ca4860575a33844ba10b"
 }