From f15982ebebb289f20a4e1d918f67bfa0bf63411d Mon Sep 17 00:00:00 2001 From: dan sinclair Date: Tue, 2 Jun 2020 01:21:03 -0400 Subject: [PATCH] Remove install to the SPIRV/ folder. (#2256) This CL updates the build scripts to only install to glslang/SPIRV instead of also installing to the SPIRV/ folder. The deprecation notice is also removed. Note, this may cause downstream build issues if include directories have not been updated Fixes #1964 #2216 --- README.md | 9 +-------- SPIRV/CMakeLists.txt | 1 - 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/README.md b/README.md index ff844c02..e96ba99b 100755 --- a/README.md +++ b/README.md @@ -5,14 +5,7 @@ ## Planned Deprecations/Removals -1. **SPIRV Folder, 1-May, 2020.** Glslang, when installed through CMake, -will install a `SPIRV` folder into `${CMAKE_INSTALL_INCLUDEDIR}`. -This `SPIRV` folder is being moved to `glslang/SPIRV`. -During the transition the `SPIRV` folder will be installed into both locations. -The old install of `SPIRV/` will be removed as a CMake install target no sooner than May 1, 2020. -See issue #1964. - -2. **Visual Studio 2013, 20-July, 2020.** Keeping code compiling for MS Visual Studio 2013 will no longer be +1. **Visual Studio 2013, 20-July, 2020.** Keeping code compiling for MS Visual Studio 2013 will no longer be a goal as of July 20, 2020, the fifth anniversary of the release of Visual Studio 2015. # Glslang Components and Status diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt index 90406099..8451446d 100644 --- a/SPIRV/CMakeLists.txt +++ b/SPIRV/CMakeLists.txt @@ -98,6 +98,5 @@ if(ENABLE_GLSLANG_INSTALL) install(EXPORT SPIRVTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/SPIRV/) install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/) endif(ENABLE_GLSLANG_INSTALL)