From a92c61f8456fa9731c0b000a2c6fc52a740c2be7 Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Wed, 14 Feb 2024 16:38:44 +0000 Subject: [PATCH] Add aliases for the public libraries This makes things consistent between when glslang is installed and imported versus when it's included as nested CMake project. You can now use `glslang::glslang` in both cases instead of needing the non-namespaced version sometimes and the namespaced one other times. Resolves one of the problems discussed in https://github.com/KhronosGroup/glslang/issues/3509 --- SPIRV/CMakeLists.txt | 2 ++ glslang/CMakeLists.txt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt index 3b6bfb45..66808812 100644 --- a/SPIRV/CMakeLists.txt +++ b/SPIRV/CMakeLists.txt @@ -79,6 +79,7 @@ set(PUBLIC_HEADERS SPVRemapper.h) add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS}) +add_library(glslang::SPIRV ALIAS SPIRV) set_target_properties(SPIRV PROPERTIES FOLDER glslang POSITION_INDEPENDENT_CODE ON @@ -92,6 +93,7 @@ glslang_add_build_info_dependency(SPIRV) if (ENABLE_SPVREMAPPER) add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) + add_library(glslang::SPVRemapper ALIAS SPVRemapper) set_target_properties(SPVRemapper PROPERTIES FOLDER glslang POSITION_INDEPENDENT_CODE ON diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt index e4690f09..8d4b1e9c 100644 --- a/glslang/CMakeLists.txt +++ b/glslang/CMakeLists.txt @@ -169,6 +169,7 @@ set(GLSLANG_HEADERS Include/Types.h) add_library(glslang ${LIB_TYPE} ${GLSLANG_SOURCES} ${GLSLANG_HEADERS}) +add_library(glslang::glslang ALIAS glslang) set_target_properties(glslang PROPERTIES FOLDER glslang POSITION_INDEPENDENT_CODE ON @@ -201,6 +202,7 @@ set(RESOURCELIMITS_HEADERS ) add_library(glslang-default-resource-limits ${RESOURCELIMITS_SOURCES} ${RESOURCELIMITS_HEADERS}) +add_library(glslang::glslang-default-resource-limits ALIAS glslang-default-resource-limits) set_target_properties(glslang-default-resource-limits PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}"