AuroraMiddleware/SPIRV-Cross-Vulnerable
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Cross.git synced 2024-09-19 22:30:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2265 from KhronosGroup/fix-2263

Browse Source 
Bump to CMake 3.6 and handle deprecated Python module check.
This commit is contained in:
Hans-Kristian Arntzen 2024-01-16 14:35:24 +01:00 committed by GitHub
commit 0a5e7b0f6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -19,7 +19,7 @@
# 2. The MIT License, found at <http://opensource.org/licenses/MIT>.
#
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.6)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_EXTENSIONS OFF)
@ -465,7 +465,19 @@ if (SPIRV_CROSS_CLI)
# - Update the reference files
# - Get cycle counts from malisc
# - Keep failing outputs
find_package(PythonInterp)
if (${CMAKE_VERSION} VERSION_GREATER "3.12")
find_package(Python3)
if (${PYTHON3_FOUND})
set(PYTHONINTERP_FOUND ON)
set(PYTHON_VERSION_MAJOR 3)
set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
else()
set(PYTHONINTERP_FOUND OFF)
endif()
else()
find_package(PythonInterp)
endif()
find_program(spirv-cross-glslang NAMES glslangValidator
PATHS ${CMAKE_CURRENT_SOURCE_DIR}/external/glslang-build/output/bin
NO_DEFAULT_PATH)