f8057b9a5b
* Add spirv-headers as a separate third_party repo Previously, we pulled in spirv-headers as part of spirv-tools. We still keep this behavior but move the content of the repo to third_party. We introduce a script for updating spirv-tools, and update the patch file. The same script will also pull in a dependent spirv-headers.
163 lines
6.3 KiB
Diff
163 lines
6.3 KiB
Diff
diff --git a/third_party/spirv-tools/CMakeLists.txt b/third_party/spirv-tools/CMakeLists.txt
|
|
index 76b87d8c5..53b3404d1 100755
|
|
--- a/third_party/spirv-tools/CMakeLists.txt
|
|
+++ b/third_party/spirv-tools/CMakeLists.txt
|
|
@@ -12,7 +12,7 @@
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
-cmake_minimum_required(VERSION 2.8.12)
|
|
+cmake_minimum_required(VERSION 3.19)
|
|
if (POLICY CMP0048)
|
|
cmake_policy(SET CMP0048 NEW)
|
|
endif()
|
|
@@ -24,8 +24,16 @@ if (POLICY CMP0054)
|
|
endif()
|
|
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
|
|
|
|
+set(SPIRV-Headers_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../spirv-headers)
|
|
+
|
|
+if (APPLE)
|
|
+ set(CMAKE_MACOSX_RPATH ON)
|
|
+endif (APPLE)
|
|
+set(SPIRV_SKIP_EXECUTABLES_OPTION ON)
|
|
+set(SPIRV_SKIP_TESTS_OPTION ON)
|
|
+set(SKIP_SPIRV_TOOLS_INSTALL ON)
|
|
+
|
|
project(spirv-tools)
|
|
-enable_testing()
|
|
set(SPIRV_TOOLS "SPIRV-Tools")
|
|
|
|
include(GNUInstallDirs)
|
|
@@ -71,7 +77,6 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
|
|
set(CMAKE_BUILD_TYPE "Debug")
|
|
endif()
|
|
|
|
-option(SKIP_SPIRV_TOOLS_INSTALL "Skip installation" ${SKIP_SPIRV_TOOLS_INSTALL})
|
|
if(NOT ${SKIP_SPIRV_TOOLS_INSTALL})
|
|
set(ENABLE_SPIRV_TOOLS_INSTALL ON)
|
|
endif()
|
|
@@ -88,7 +93,8 @@ set(SPIRV_LIB_FUZZING_ENGINE_LINK_OPTIONS "" CACHE STRING "Used by OSS-Fuzz to c
|
|
|
|
option(SPIRV_BUILD_LIBFUZZER_TARGETS "Build libFuzzer targets" OFF)
|
|
|
|
-option(SPIRV_WERROR "Enable error on warning" ON)
|
|
+set(SPIRV_WERROR OFF)
|
|
+
|
|
if(("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR (("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") AND (NOT CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")))
|
|
set(COMPILER_IS_LIKE_GNU TRUE)
|
|
endif()
|
|
@@ -243,7 +249,12 @@ if(NOT COMMAND find_host_program)
|
|
endif()
|
|
|
|
# Tests require Python3
|
|
-find_host_package(PythonInterp 3 REQUIRED)
|
|
+if(CMAKE_VERSION VERSION_LESS "3.12" OR ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
|
|
+ find_host_package(PythonInterp 3 REQUIRED)
|
|
+else()
|
|
+ find_package(Python3 COMPONENTS Interpreter)
|
|
+ set(PYTHON_EXECUTABLE "${Python3_EXECUTABLE}")
|
|
+endif()
|
|
|
|
# Check for symbol exports on Linux.
|
|
# At the moment, this check will fail on the OSX build machines for the Android NDK.
|
|
@@ -286,11 +297,11 @@ if(ENABLE_SPIRV_TOOLS_INSTALL)
|
|
endif()
|
|
|
|
# Defaults to OFF if the user didn't set it.
|
|
-option(SPIRV_SKIP_EXECUTABLES
|
|
- "Skip building the executable and tests along with the library"
|
|
- ${SPIRV_SKIP_EXECUTABLES})
|
|
-option(SPIRV_SKIP_TESTS
|
|
- "Skip building tests along with the library" ${SPIRV_SKIP_TESTS})
|
|
+option(SPIRV_SKIP_EXECUTABLES
|
|
+ "Skip building the executable and tests along with the library"
|
|
+ ${SPIRV_SKIP_EXECUTABLES_OPTION})
|
|
+option(SPIRV_SKIP_TESTS
|
|
+ "Skip building tests along with the library" ${SPIRV_SKIP_TESTS_OPTION})
|
|
if ("${SPIRV_SKIP_EXECUTABLES}")
|
|
set(SPIRV_SKIP_TESTS ON)
|
|
endif()
|
|
@@ -334,9 +347,6 @@ endif()
|
|
add_subdirectory(source)
|
|
add_subdirectory(tools)
|
|
|
|
-add_subdirectory(test)
|
|
-add_subdirectory(examples)
|
|
-
|
|
if(ENABLE_SPIRV_TOOLS_INSTALL)
|
|
install(
|
|
FILES
|
|
@@ -357,38 +367,3 @@ endif()
|
|
|
|
set(SPIRV_LIBRARIES "-lSPIRV-Tools-opt -lSPIRV-Tools -lSPIRV-Tools-link")
|
|
set(SPIRV_SHARED_LIBRARIES "-lSPIRV-Tools-shared")
|
|
-
|
|
-# Build pkg-config file
|
|
-# Use a first-class target so it's regenerated when relevant files are updated.
|
|
-add_custom_target(spirv-tools-pkg-config ALL
|
|
- COMMAND ${CMAKE_COMMAND}
|
|
- -DCHANGES_FILE=${CMAKE_CURRENT_SOURCE_DIR}/CHANGES
|
|
- -DTEMPLATE_FILE=${CMAKE_CURRENT_SOURCE_DIR}/cmake/SPIRV-Tools.pc.in
|
|
- -DOUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools.pc
|
|
- -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
|
|
- -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
|
|
- -DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR}
|
|
- -DSPIRV_LIBRARIES=${SPIRV_LIBRARIES}
|
|
- -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake
|
|
- DEPENDS "CHANGES" "cmake/SPIRV-Tools.pc.in" "cmake/write_pkg_config.cmake")
|
|
-add_custom_target(spirv-tools-shared-pkg-config ALL
|
|
- COMMAND ${CMAKE_COMMAND}
|
|
- -DCHANGES_FILE=${CMAKE_CURRENT_SOURCE_DIR}/CHANGES
|
|
- -DTEMPLATE_FILE=${CMAKE_CURRENT_SOURCE_DIR}/cmake/SPIRV-Tools-shared.pc.in
|
|
- -DOUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools-shared.pc
|
|
- -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
|
|
- -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
|
|
- -DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR}
|
|
- -DSPIRV_SHARED_LIBRARIES=${SPIRV_SHARED_LIBRARIES}
|
|
- -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake
|
|
- DEPENDS "CHANGES" "cmake/SPIRV-Tools-shared.pc.in" "cmake/write_pkg_config.cmake")
|
|
-
|
|
-# Install pkg-config file
|
|
-if (ENABLE_SPIRV_TOOLS_INSTALL)
|
|
- install(
|
|
- FILES
|
|
- ${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools.pc
|
|
- ${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools-shared.pc
|
|
- DESTINATION
|
|
- ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
|
|
-endif()
|
|
diff --git a/third_party/spirv-tools/source/CMakeLists.txt b/third_party/spirv-tools/source/CMakeLists.txt
|
|
index 98559b8fe..0734d6a82 100644
|
|
--- a/third_party/spirv-tools/source/CMakeLists.txt
|
|
+++ b/third_party/spirv-tools/source/CMakeLists.txt
|
|
@@ -374,13 +374,6 @@ endfunction()
|
|
|
|
# Always build ${SPIRV_TOOLS}-shared. This is expected distro packages, and
|
|
# unlike the other SPIRV_TOOLS target, defaults to hidden symbol visibility.
|
|
-add_library(${SPIRV_TOOLS}-shared SHARED ${SPIRV_SOURCES})
|
|
-spirv_tools_default_target_options(${SPIRV_TOOLS}-shared)
|
|
-set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES CXX_VISIBILITY_PRESET hidden)
|
|
-target_compile_definitions(${SPIRV_TOOLS}-shared
|
|
- PRIVATE SPIRV_TOOLS_IMPLEMENTATION
|
|
- PUBLIC SPIRV_TOOLS_SHAREDLIB
|
|
-)
|
|
|
|
if(SPIRV_TOOLS_BUILD_STATIC)
|
|
add_library(${SPIRV_TOOLS}-static STATIC ${SPIRV_SOURCES})
|
|
@@ -396,11 +389,11 @@ if(SPIRV_TOOLS_BUILD_STATIC)
|
|
add_library(${SPIRV_TOOLS} ALIAS ${SPIRV_TOOLS}-static)
|
|
endif()
|
|
|
|
- set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-static ${SPIRV_TOOLS}-shared)
|
|
+ set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-static)
|
|
else()
|
|
add_library(${SPIRV_TOOLS} ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_SOURCES})
|
|
spirv_tools_default_target_options(${SPIRV_TOOLS})
|
|
- set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS} ${SPIRV_TOOLS}-shared)
|
|
+ set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS})
|
|
endif()
|
|
|
|
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
|
|
|