Skip to content

Commit

Permalink
Merge pull request #1963 from KhronosGroup/revert-7b0e236
Browse files Browse the repository at this point in the history
Fix #1959 by reverting 7b0e236 to put files in two places.
  • Loading branch information
johnkslang authored Nov 6, 2019
2 parents 442a8a9 + 199d115 commit e471df3
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions SPIRV/CMakeLists.txt
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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)

0 comments on commit e471df3

Please sign in to comment.