Merge pull request #1963 from KhronosGroup/revert-7b0e2363

Fix #1959 by reverting 7b0e2363 to put files in two places.

Merge pull request #1963 from KhronosGroup/revert-7b0e2363
e471df3c · John Kessenich · GitHub · 442a8a99 · 199d115e · e471df3c
Unverified Commit e471df3c authored Nov 06, 2019 by John Kessenich Committed by GitHub Nov 06, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

CMakeLists.txt SPIRV/CMakeLists.txt +4 -3

No files found.
--- a/SPIRV/CMakeLists.txt
+++ b/SPIRV/CMakeLists.txt
@@ -90,9 +90,10 @@ if(ENABLE_GLSLANG_INSTALL)
        install(TARGETS SPIRV EXPORT SPIRVTargets
                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
    endif()
-	
-	install(EXPORT SPVRemapperTargets DESTINATION lib/cmake)
-	install(EXPORT SPIRVTargets DESTINATION lib/cmake)

+    install(EXPORT SPVRemapperTargets DESTINATION lib/cmake)
+    install(EXPORT SPIRVTargets DESTINATION lib/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)