Fix CMake file install paths

Fixes #460.
Fixes #483.
Fixes #606.
This commit is contained in:
Zbigniew Mandziejewicz 2016-02-02 00:04:15 +01:00 committed by Camilla Berglund
parent 832c2ffa3b
commit 6466c9d406
2 changed files with 6 additions and 5 deletions

View File

@ -368,9 +368,9 @@ endforeach()
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
if (UNIX) if (UNIX)
set(GLFW_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/lib/cmake/glfw3/") set(GLFW_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/cmake/glfw3")
else() else()
set(GLFW_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/") set(GLFW_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}")
endif() endif()
configure_package_config_file("${GLFW_SOURCE_DIR}/src/glfw3Config.cmake.in" configure_package_config_file("${GLFW_SOURCE_DIR}/src/glfw3Config.cmake.in"
@ -421,11 +421,11 @@ if (GLFW_INSTALL)
install(FILES "${GLFW_BINARY_DIR}/src/glfw3Config.cmake" install(FILES "${GLFW_BINARY_DIR}/src/glfw3Config.cmake"
"${GLFW_BINARY_DIR}/src/glfw3ConfigVersion.cmake" "${GLFW_BINARY_DIR}/src/glfw3ConfigVersion.cmake"
DESTINATION lib${LIB_SUFFIX}/cmake/glfw) DESTINATION "${GLFW_CONFIG_PATH}")
install(EXPORT glfwTargets DESTINATION lib${LIB_SUFFIX}/cmake/glfw) install(EXPORT glfwTargets DESTINATION "${GLFW_CONFIG_PATH}")
install(FILES "${GLFW_BINARY_DIR}/src/glfw3.pc" install(FILES "${GLFW_BINARY_DIR}/src/glfw3.pc"
DESTINATION lib${LIB_SUFFIX}/pkgconfig) DESTINATION "lib${LIB_SUFFIX}/pkgconfig")
# Only generate this target if no higher-level project already has # Only generate this target if no higher-level project already has
if (NOT TARGET uninstall) if (NOT TARGET uninstall)

View File

@ -173,6 +173,7 @@ skills.
- Martins Mozeiko - Martins Mozeiko
- Tristam MacDonald - Tristam MacDonald
- Hans Mackowiak - Hans Mackowiak
- Zbigniew Mandziejewicz
- Kyle McDonald - Kyle McDonald
- David Medlock - David Medlock
- Bryce Mehring - Bryce Mehring