From 83c124db41455f8317d229a78f059289646aa51b Mon Sep 17 00:00:00 2001 From: cjee21 <77721854+cjee21@users.noreply.github.com> Date: Mon, 9 Mar 2026 18:52:15 +0800 Subject: [PATCH] CMake: Prefer C++20 but minimum C++11 --- .github/workflows/ZenLib_Checks.yml | 2 +- Project/CMake/CMakeLists.txt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ZenLib_Checks.yml b/.github/workflows/ZenLib_Checks.yml index 499b599..b9d6b02 100644 --- a/.github/workflows/ZenLib_Checks.yml +++ b/.github/workflows/ZenLib_Checks.yml @@ -62,7 +62,7 @@ jobs: matrix: include: - runner: windows-latest - CXXFLAGS: "/std:c++20 /WX /MP" + CXXFLAGS: "/WX" - runner: ubuntu-latest CXXFLAGS: "-Werror" - runner: macos-latest diff --git a/Project/CMake/CMakeLists.txt b/Project/CMake/CMakeLists.txt index 9068eb8..d4c98c8 100644 --- a/Project/CMake/CMakeLists.txt +++ b/Project/CMake/CMakeLists.txt @@ -166,10 +166,11 @@ set_target_properties(zen PROPERTIES VERSION ${ZenLib_VERSION} SOVERSION ${ZenLib_MAJOR_VERSION} PUBLIC_HEADER "${ZenLib_HDRS}" - CXX_STANDARD 11 + CXX_STANDARD 20 CXX_EXTENSIONS NO - CXX_STANDARD_REQUIRED YES + CXX_STANDARD_REQUIRED NO ) +target_compile_features(zen PRIVATE cxx_std_11) install(TARGETS zen EXPORT zen-export PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR}/ZenLib