Merge pull request #1363 from mattparks/patch4

Fixed install for SPIRV, glslang, and hlsl when building shared libs

Merge pull request #1363 from mattparks/patch4
25bef930 · John Kessenich · GitHub · 115cf8ea · 1199cf92 · 25bef930
Unverified Commit 25bef930 authored May 03, 2018 by John Kessenich Committed by GitHub May 03, 2018
Showing with 29 additions and 6 deletions

CMakeLists.txt SPIRV/CMakeLists.txt +8 -2

CMakeLists.txt StandAlone/CMakeLists.txt +5 -0

CMakeLists.txt glslang/CMakeLists.txt +8 -2

CMakeLists.txt hlsl/CMakeLists.txt +8 -2

No files found.
--- a/SPIRV/CMakeLists.txt
+++ b/SPIRV/CMakeLists.txt
@@ -69,8 +69,14 @@ if(WIN32)
 endif(WIN32)
 if(ENABLE_GLSLANG_INSTALL)
-    install(TARGETS SPIRV SPVRemapper
+    if(BUILD_SHARED_LIBS)
-            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+        install(TARGETS SPIRV SPVRemapper
+                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+                LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    else()
+        install(TARGETS SPIRV SPVRemapper
+                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    endif()
    install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/SPIRV/)
 endif(ENABLE_GLSLANG_INSTALL)
--- a/StandAlone/CMakeLists.txt
+++ b/StandAlone/CMakeLists.txt
@@ -44,4 +44,9 @@ if(ENABLE_GLSLANG_INSTALL)
    install(TARGETS spirv-remap
            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+    if(BUILD_SHARED_LIBS)
+        install(TARGETS glslang-default-resource-limits
+                LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    endif()
 endif(ENABLE_GLSLANG_INSTALL)
--- a/glslang/CMakeLists.txt
+++ b/glslang/CMakeLists.txt
@@ -102,8 +102,14 @@ if(WIN32)
 endif(WIN32)
 if(ENABLE_GLSLANG_INSTALL)
-    install(TARGETS glslang
+    if(BUILD_SHARED_LIBS)
-            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+        install(TARGETS glslang
+                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+                LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    else()
+        install(TARGETS glslang
+                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    endif()
 endif(ENABLE_GLSLANG_INSTALL)
 if(ENABLE_GLSLANG_INSTALL)

--- a/hlsl/CMakeLists.txt
+++ b/hlsl/CMakeLists.txt
@@ -30,6 +30,12 @@ if(WIN32)
 endif(WIN32)
 if(ENABLE_GLSLANG_INSTALL)
-    install(TARGETS HLSL
+    if(BUILD_SHARED_LIBS)
-            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+        install(TARGETS HLSL
+                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+                LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    else()
+        install(TARGETS HLSL
+                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    endif()
 endif(ENABLE_GLSLANG_INSTALL)