From 18a1c9d44c7d489293c521797ca20539bd954398 Mon Sep 17 00:00:00 2001 From: christophe Date: Sat, 18 Oct 2025 14:34:59 +0200 Subject: [PATCH] Build GLM with minimum the use of C++17 --- CMakeLists.txt | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e6ed427b..7cae022a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,9 +27,6 @@ option(GLM_BUILD_INSTALL "Generate the install target" ${GLM_IS_MASTER_PROJECT}) include(GNUInstallDirs) -option(GLM_ENABLE_CXX_98 "Enable C++ 98" OFF) -option(GLM_ENABLE_CXX_11 "Enable C++ 11" OFF) -option(GLM_ENABLE_CXX_14 "Enable C++ 14" OFF) option(GLM_ENABLE_CXX_17 "Enable C++ 17" OFF) option(GLM_ENABLE_CXX_20 "Enable C++ 20" OFF) @@ -61,43 +58,8 @@ elseif(GLM_ENABLE_CXX_17) message(STATUS "GLM: Build with C++17 features") endif() -elseif(GLM_ENABLE_CXX_14) - set(CMAKE_CXX_STANDARD 14) - add_definitions(-DGLM_FORCE_CXX14) - if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - message(STATUS "GLM: Disable -Wc++98-compat warnings") - add_compile_options(-Wno-c++98-compat) - add_compile_options(-Wno-c++98-compat-pedantic) - add_compile_options(-Wno-switch-default) - endif() - if(NOT GLM_QUIET) - message(STATUS "GLM: Build with C++14 features") - endif() - -elseif(GLM_ENABLE_CXX_11) - set(CMAKE_CXX_STANDARD 11) - add_definitions(-DGLM_FORCE_CXX11) - if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - message(STATUS "GLM: Disable -Wc++98-compat warnings") - add_compile_options(-Wno-c++98-compat) - add_compile_options(-Wno-c++98-compat-pedantic) - add_compile_options(-Wno-switch-default) - endif() - if(NOT GLM_QUIET) - message(STATUS "GLM: Build with C++11 features") - endif() - -elseif(GLM_ENABLE_CXX_98) - set(CMAKE_CXX_STANDARD 98) - add_definitions(-DGLM_FORCE_CXX98) - if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - add_compile_options(-Wno-switch-default) - endif() - if(NOT GLM_QUIET) - message(STATUS "GLM: Build with C++98 features") - endif() - else() + set(CMAKE_CXX_STANDARD 17) if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") message(STATUS "GLM: Disable -Wc++98-compat warnings") add_compile_options(-Wno-c++98-compat)