mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix outdated cmake conditional

Browse Source 
Remove cmake condition. The minimum is 3.14. The condition is no longer
required.

C++17 is now required. Update the landing page.
This commit is contained in:
Jeremy Hayes 2023-03-15 17:41:29 -06:00 committed by Jeremy Hayes
parent cd2082e058
commit 0094e47972
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -227,16 +227,10 @@ if(ENABLE_GLSLANG_JS)
endif() endif()
endif() endif()
# Request C++11 # Request C++17
if(${CMAKE_VERSION} VERSION_LESS 3.1) set(CMAKE_CXX_STANDARD 17)
# CMake versions before 3.1 do not understand CMAKE_CXX_STANDARD set(CMAKE_CXX_STANDARD_REQUIRED ON)
# remove this block once CMake >=3.1 has fixated in the ecosystem set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
else()
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
endif()
function(glslang_set_link_args TARGET) function(glslang_set_link_args TARGET)
# For MinGW compiles, statically link against the GCC and C++ runtimes. # For MinGW compiles, statically link against the GCC and C++ runtimes.

6
README.md
View File

@ -9,7 +9,7 @@ git branch -u origin/main main
git remote set-head origin -a git remote set-head origin -a
``` ```
2. Visual Studio 2019 is now the minimum supported compiler for windows. This change was driven by the external dependency on SPIRV-Tools. 2. C++17 (all platforms) and Visual Studio 2019 (Windows) are now required. This change was driven by the external dependency on SPIRV-Tools.
[![appveyor status](https://ci.appveyor.com/api/projects/status/q6fi9cb0qnhkla68/branch/main?svg=true)](https://ci.appveyor.com/project/Khronoswebmaster/glslang/branch/main) [![appveyor status](https://ci.appveyor.com/api/projects/status/q6fi9cb0qnhkla68/branch/main?svg=true)](https://ci.appveyor.com/project/Khronoswebmaster/glslang/branch/main)
![Continuous Deployment](https://github.com/KhronosGroup/glslang/actions/workflows/continuous_deployment.yml/badge.svg) ![Continuous Deployment](https://github.com/KhronosGroup/glslang/actions/workflows/continuous_deployment.yml/badge.svg)
@ -98,8 +98,8 @@ branch.
### Dependencies ### Dependencies
* A C++11 compiler. * A C++17 compiler.
(For MSVS: use 2015 or later.) (For MSVS: use 2019 or later.)
* [CMake][cmake]: for generating compilation targets. * [CMake][cmake]: for generating compilation targets.
* make: _Linux_, ninja is an alternative, if configured. * make: _Linux_, ninja is an alternative, if configured.
* [Python 3.x][python]: for executing SPIRV-Tools scripts. (Optional if not using SPIRV-Tools and the 'External' subdirectory does not exist.) * [Python 3.x][python]: for executing SPIRV-Tools scripts. (Optional if not using SPIRV-Tools and the 'External' subdirectory does not exist.)