Browse Source

Build GLM with minimum the use of C++17

christophe 1 month ago
parent
commit
18a1c9d44c
1 changed files with 1 additions and 39 deletions
  1. 1 39
      CMakeLists.txt

+ 1 - 39
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)