From 6466c9d4060448b39f0aeaa85e7480804cd1fec6 Mon Sep 17 00:00:00 2001 From: Zbigniew Mandziejewicz Date: Tue, 2 Feb 2016 00:04:15 +0100 Subject: [PATCH] Fix CMake file install paths Fixes #460. Fixes #483. Fixes #606. --- CMakeLists.txt | 10 +++++----- README.md | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 024fbdca..39e0b48a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -368,9 +368,9 @@ endforeach() include(CMakePackageConfigHelpers) 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() - set(GLFW_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/") + set(GLFW_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}") endif() 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" "${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" - DESTINATION lib${LIB_SUFFIX}/pkgconfig) + DESTINATION "lib${LIB_SUFFIX}/pkgconfig") # Only generate this target if no higher-level project already has if (NOT TARGET uninstall) diff --git a/README.md b/README.md index 43c1abca..a030c48f 100644 --- a/README.md +++ b/README.md @@ -173,6 +173,7 @@ skills. - Martins Mozeiko - Tristam MacDonald - Hans Mackowiak + - Zbigniew Mandziejewicz - Kyle McDonald - David Medlock - Bryce Mehring