mirror of
https://github.com/KhronosGroup/glslang
synced 2024-09-19 12:19:53 +00:00
Merge pull request #3009 from Tachi107/cmake-config-file-libdir
build: install glslang-config.cmake to libdir
This commit is contained in:
commit
9e78bc8108
@ -375,13 +375,13 @@ if(ENABLE_GLSLANG_INSTALL)
|
|||||||
include("@PACKAGE_PATH_EXPORT_TARGETS@")
|
include("@PACKAGE_PATH_EXPORT_TARGETS@")
|
||||||
]=])
|
]=])
|
||||||
|
|
||||||
set(PATH_EXPORT_TARGETS "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake")
|
set(PATH_EXPORT_TARGETS "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake")
|
||||||
configure_package_config_file(
|
configure_package_config_file(
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/glslang-config.cmake.in"
|
"${CMAKE_CURRENT_BINARY_DIR}/glslang-config.cmake.in"
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/glslang-config.cmake"
|
"${CMAKE_CURRENT_BINARY_DIR}/glslang-config.cmake"
|
||||||
PATH_VARS
|
PATH_VARS
|
||||||
PATH_EXPORT_TARGETS
|
PATH_EXPORT_TARGETS
|
||||||
INSTALL_DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}
|
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}
|
||||||
)
|
)
|
||||||
|
|
||||||
write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/glslang-config-version.cmake"
|
write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/glslang-config-version.cmake"
|
||||||
@ -392,7 +392,7 @@ if(ENABLE_GLSLANG_INSTALL)
|
|||||||
install(
|
install(
|
||||||
EXPORT glslang-targets
|
EXPORT glslang-targets
|
||||||
NAMESPACE "glslang::"
|
NAMESPACE "glslang::"
|
||||||
DESTINATION "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}"
|
DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}"
|
||||||
)
|
)
|
||||||
|
|
||||||
install(
|
install(
|
||||||
@ -400,6 +400,6 @@ if(ENABLE_GLSLANG_INSTALL)
|
|||||||
"${CMAKE_CURRENT_BINARY_DIR}/glslang-config.cmake"
|
"${CMAKE_CURRENT_BINARY_DIR}/glslang-config.cmake"
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/glslang-config-version.cmake"
|
"${CMAKE_CURRENT_BINARY_DIR}/glslang-config-version.cmake"
|
||||||
DESTINATION
|
DESTINATION
|
||||||
"${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}"
|
"${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
@ -49,7 +49,7 @@ if(ENABLE_GLSLANG_INSTALL)
|
|||||||
message(WARNING \"Using `OGLCompilerTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
|
message(WARNING \"Using `OGLCompilerTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
|
||||||
|
|
||||||
if (NOT TARGET glslang::OGLCompiler)
|
if (NOT TARGET glslang::OGLCompiler)
|
||||||
include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\")
|
include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_library(OGLCompiler ALIAS glslang::OGLCompiler)
|
add_library(OGLCompiler ALIAS glslang::OGLCompiler)
|
||||||
|
@ -121,7 +121,7 @@ if(ENABLE_GLSLANG_INSTALL)
|
|||||||
message(WARNING \"Using `SPVRemapperTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
|
message(WARNING \"Using `SPVRemapperTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
|
||||||
|
|
||||||
if (NOT TARGET glslang::SPVRemapper)
|
if (NOT TARGET glslang::SPVRemapper)
|
||||||
include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\")
|
include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_library(SPVRemapper ALIAS glslang::SPVRemapper)
|
add_library(SPVRemapper ALIAS glslang::SPVRemapper)
|
||||||
@ -133,7 +133,7 @@ if(ENABLE_GLSLANG_INSTALL)
|
|||||||
message(WARNING \"Using `SPIRVTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
|
message(WARNING \"Using `SPIRVTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
|
||||||
|
|
||||||
if (NOT TARGET glslang::SPIRV)
|
if (NOT TARGET glslang::SPIRV)
|
||||||
include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\")
|
include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_library(SPIRV ALIAS glslang::SPIRV)
|
add_library(SPIRV ALIAS glslang::SPIRV)
|
||||||
|
@ -111,7 +111,7 @@ if(ENABLE_GLSLANG_INSTALL)
|
|||||||
message(WARNING \"Using `glslangValidatorTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
|
message(WARNING \"Using `glslangValidatorTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
|
||||||
|
|
||||||
if (NOT TARGET glslang::glslangValidator)
|
if (NOT TARGET glslang::glslangValidator)
|
||||||
include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\")
|
include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_library(glslangValidator ALIAS glslang::glslangValidator)
|
add_library(glslangValidator ALIAS glslang::glslangValidator)
|
||||||
@ -126,7 +126,7 @@ if(ENABLE_GLSLANG_INSTALL)
|
|||||||
message(WARNING \"Using `spirv-remapTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
|
message(WARNING \"Using `spirv-remapTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
|
||||||
|
|
||||||
if (NOT TARGET glslang::spirv-remap)
|
if (NOT TARGET glslang::spirv-remap)
|
||||||
include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\")
|
include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_library(spirv-remap ALIAS glslang::spirv-remap)
|
add_library(spirv-remap ALIAS glslang::spirv-remap)
|
||||||
@ -141,7 +141,7 @@ if(ENABLE_GLSLANG_INSTALL)
|
|||||||
message(WARNING \"Using `glslang-default-resource-limitsTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
|
message(WARNING \"Using `glslang-default-resource-limitsTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
|
||||||
|
|
||||||
if (NOT TARGET glslang::glslang-default-resource-limits)
|
if (NOT TARGET glslang::glslang-default-resource-limits)
|
||||||
include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\")
|
include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_library(glslang-default-resource-limits ALIAS glslang::glslang-default-resource-limits)
|
add_library(glslang-default-resource-limits ALIAS glslang::glslang-default-resource-limits)
|
||||||
|
@ -209,7 +209,7 @@ if(ENABLE_GLSLANG_INSTALL)
|
|||||||
message(WARNING \"Using `glslangTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
|
message(WARNING \"Using `glslangTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
|
||||||
|
|
||||||
if (NOT TARGET glslang::glslang)
|
if (NOT TARGET glslang::glslang)
|
||||||
include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\")
|
include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(${BUILD_SHARED_LIBS})
|
if(${BUILD_SHARED_LIBS})
|
||||||
|
@ -60,7 +60,7 @@ if(ENABLE_GLSLANG_INSTALL)
|
|||||||
message(WARNING \"Using `OSDependentTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
|
message(WARNING \"Using `OSDependentTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
|
||||||
|
|
||||||
if (NOT TARGET glslang::OSDependent)
|
if (NOT TARGET glslang::OSDependent)
|
||||||
include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\")
|
include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_library(OSDependent ALIAS glslang::OSDependent)
|
add_library(OSDependent ALIAS glslang::OSDependent)
|
||||||
|
@ -55,7 +55,7 @@ if(ENABLE_GLSLANG_INSTALL)
|
|||||||
message(WARNING \"Using `OSDependentTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
|
message(WARNING \"Using `OSDependentTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
|
||||||
|
|
||||||
if (NOT TARGET glslang::OSDependent)
|
if (NOT TARGET glslang::OSDependent)
|
||||||
include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\")
|
include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_library(OSDependent ALIAS glslang::OSDependent)
|
add_library(OSDependent ALIAS glslang::OSDependent)
|
||||||
|
@ -76,7 +76,7 @@ if(BUILD_TESTING)
|
|||||||
message(WARNING \"Using `glslangtestsTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
|
message(WARNING \"Using `glslangtestsTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
|
||||||
|
|
||||||
if (NOT TARGET glslang::glslangtests)
|
if (NOT TARGET glslang::glslangtests)
|
||||||
include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\")
|
include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_library(glslangtests ALIAS glslang::glslangtests)
|
add_library(glslangtests ALIAS glslang::glslangtests)
|
||||||
|
@ -52,7 +52,7 @@ if(ENABLE_GLSLANG_INSTALL)
|
|||||||
message(WARNING \"Using `HLSLTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
|
message(WARNING \"Using `HLSLTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
|
||||||
|
|
||||||
if (NOT TARGET glslang::HLSL)
|
if (NOT TARGET glslang::HLSL)
|
||||||
include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake\")
|
include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_library(HLSL ALIAS glslang::HLSL)
|
add_library(HLSL ALIAS glslang::HLSL)
|
||||||
|
Loading…
Reference in New Issue
Block a user