Sfoglia il codice sorgente

CMake target installation fixes

Camilla Berglund 9 anni fa
parent
commit
7f7ad39e15
2 ha cambiato i file con 2 aggiunte e 2 eliminazioni
  1. 1 1
      CMakeLists.txt
  2. 1 1
      src/CMakeLists.txt

+ 1 - 1
CMakeLists.txt

@@ -371,7 +371,6 @@ set(GLFW_CONFIG_PATH "lib${LIB_SUFFIX}/cmake/glfw3")
 configure_package_config_file("${GLFW_SOURCE_DIR}/src/glfw3Config.cmake.in"
                               "${GLFW_BINARY_DIR}/src/glfw3Config.cmake"
                               INSTALL_DESTINATION "${GLFW_CONFIG_PATH}"
-                              PATH_VARS CMAKE_INSTALL_PREFIX
                               NO_CHECK_REQUIRED_COMPONENTS_MACRO)
 
 write_basic_package_version_file("${GLFW_BINARY_DIR}/src/glfw3ConfigVersion.cmake" 
@@ -419,6 +418,7 @@ if (GLFW_INSTALL)
             DESTINATION "${GLFW_CONFIG_PATH}")
 
     install(EXPORT glfwTargets FILE glfw3Targets.cmake
+            EXPORT_LINK_INTERFACE_LIBRARIES
             DESTINATION "${GLFW_CONFIG_PATH}")
     install(FILES "${GLFW_BINARY_DIR}/src/glfw3.pc"
             DESTINATION "lib${LIB_SUFFIX}/pkgconfig")

+ 1 - 1
src/CMakeLists.txt

@@ -96,7 +96,7 @@ if (BUILD_SHARED_LIBS)
         target_compile_options(glfw PRIVATE "-fno-common")
 
         set_target_properties(glfw PROPERTIES
-            INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
+                              INSTALL_NAME_DIR "lib${LIB_SUFFIX}")
     elseif (UNIX)
         # Hide symbols not explicitly tagged for export from the shared library
         target_compile_options(glfw PRIVATE "-fvisibility=hidden")