From 3549cd6ec212f4cd41708350aa629bc71dd11a3e Mon Sep 17 00:00:00 2001 From: Krzysztof Pilch Date: Thu, 8 Apr 2021 16:33:29 +0200 Subject: [PATCH 1/2] Removed condition for glslang-default-resource-limits instalation. This way the limits are available to clients that links statically. --- StandAlone/CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt index bff9ab61..30326516 100644 --- a/StandAlone/CMakeLists.txt +++ b/StandAlone/CMakeLists.txt @@ -98,9 +98,7 @@ if(ENABLE_GLSLANG_INSTALL) install(EXPORT spirv-remapTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) endif() - if(BUILD_SHARED_LIBS) - install(TARGETS glslang-default-resource-limits EXPORT glslang-default-resource-limitsTargets - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(EXPORT glslang-default-resource-limitsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - endif() + install(TARGETS glslang-default-resource-limits EXPORT glslang-default-resource-limitsTargets + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(EXPORT glslang-default-resource-limitsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) endif(ENABLE_GLSLANG_INSTALL) From bb9746ae2d6e5d4ef35f9e972aba8958ec24e82f Mon Sep 17 00:00:00 2001 From: Krzysztof Pilch Date: Fri, 9 Apr 2021 16:20:01 +0200 Subject: [PATCH 2/2] Fixed CMake configuration for resource-limits library. --- StandAlone/CMakeLists.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt index 30326516..751d1cd7 100644 --- a/StandAlone/CMakeLists.txt +++ b/StandAlone/CMakeLists.txt @@ -98,7 +98,14 @@ if(ENABLE_GLSLANG_INSTALL) install(EXPORT spirv-remapTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) endif() - install(TARGETS glslang-default-resource-limits EXPORT glslang-default-resource-limitsTargets - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + if(BUILD_SHARED_LIBS) + install(TARGETS glslang-default-resource-limits EXPORT glslang-default-resource-limitsTargets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + else() + install(TARGETS glslang-default-resource-limits EXPORT glslang-default-resource-limitsTargets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() install(EXPORT glslang-default-resource-limitsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) endif(ENABLE_GLSLANG_INSTALL)