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

Remove install to the SPIRV/ folder. (#2256)
f15982eb · dan sinclair · GitHub · d39b8afc · f15982eb · f15982eb
Unverified Commit f15982eb authored Jun 02, 2020 by dan sinclair Committed by GitHub Jun 01, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 9 deletions

README.md README.md +1 -8

CMakeLists.txt SPIRV/CMakeLists.txt +0 -1

No files found.
--- a/README.md
+++ b/README.md
@@ -5,14 +5,7 @@
 ## Planned Deprecations/Removals
-1. **SPIRV Folder, 1-May, 2020.** Glslang, when installed through CMake,
+1. **Visual Studio 2013, 20-July, 2020.** Keeping code compiling for MS Visual Studio 2013 will no longer be
-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
 a goal as of July 20, 2020, the fifth anniversary of the release of Visual Studio 2015.
 # Glslang Components and Status

--- 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)