mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3027 from rhabacker/fix-cmake-files-install-location

Browse Source 
cmake: Use common installation directory for cmake support files.
This commit is contained in:
Jeremy Hayes 2022-09-28 08:08:49 -06:00 committed by GitHub
commit 28b53119bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -375,13 +375,13 @@ if(ENABLE_GLSLANG_INSTALL)
include("@PACKAGE_PATH_EXPORT_TARGETS@") include("@PACKAGE_PATH_EXPORT_TARGETS@")
]=]) ]=])
set(PATH_EXPORT_TARGETS "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake") set(PATH_EXPORT_TARGETS "${CMAKE_INSTALL_LIBDIR}/cmake/${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_LIBDIR}/${PROJECT_NAME} INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${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_LIBDIR}/${PROJECT_NAME}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${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_LIBDIR}/${PROJECT_NAME}" "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
) )
endif() endif()