Revise config.cmake generation

libgeotiff/CMakeLists.txt

@@ -291,7 +291,7 @@ if(UNIX)
       set_target_properties(
         ${GEOTIFF_LIBRARY_TARGET}
         PROPERTIES
-        INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+        INSTALL_NAME_DIR "$<INSTALL_PREFIX>/${CMAKE_INSTALL_LIBDIR}")
    endif()
 endif()
 
@@ -350,11 +350,7 @@ target_include_directories( ${GEOTIFF_LIBRARY_TARGET} PUBLIC
             $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
 
 INSTALL( TARGETS ${GEOTIFF_LIBRARY_TARGET}
-     EXPORT depends
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+     EXPORT depends)
 
 IF (MSVC)
 IF (BUILD_SHARED_LIBS)

libgeotiff/bin/CMakeLists.txt

@@ -39,7 +39,4 @@ MESSAGE(STATUS "Adding GeoTIFF utilities to build - done: ${GEOTIFF_UTILITIES}")
 ###############################################################################
 # Targets installation
 
-INSTALL(TARGETS ${GEOTIFF_UTILITIES}
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+INSTALL(TARGETS ${GEOTIFF_UTILITIES})

libgeotiff/cmake/CMakeLists.txt

@@ -2,33 +2,28 @@
 # Config file generation and installation
 #############################################################################
 
-# geotiff-config.cmake for the install tree.  It's installed in
-# ${INSTALL_CMAKE_DIR} and @PROJECT_ROOT_DIR@ is the relative
-# path to the root from there.  (Note that the whole install tree can
-# be relocated.)
-if (NOT WIN32)
-  set (INSTALL_CMAKE_DIR "share/cmake/${PROJECT_NAME}")
-  set (PROJECT_ROOT_DIR "../../..")
-else ()
-  set (INSTALL_CMAKE_DIR "cmake")
-  set (PROJECT_ROOT_DIR "..")
-endif ()
 
-configure_file (project-config.cmake.in project-config.cmake @ONLY)
-configure_file (project-config-version.cmake.in
-  project-config-version.cmake @ONLY)
-install (FILES
-  "${CMAKE_CURRENT_BINARY_DIR}/project-config.cmake"
-  DESTINATION "${INSTALL_CMAKE_DIR}"
-  RENAME "${PROJECT_NAME_LOWER}-config.cmake")
+set (INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
+
+include(CMakePackageConfigHelpers)
+configure_package_config_file(
+    project-config.cmake.in
+    ${PROJECT_NAME_LOWER}Config.cmake
+    PATH_VARS CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_BINDIR
+    INSTALL_DESTINATION ${INSTALL_CMAKE_DIR}
+)
+write_basic_package_version_file(
+    ${PROJECT_NAME_LOWER}ConfigVersion.cmake
+    VERSION ${PROJECT_VERSION}
+    COMPATIBILITY AnyNewerVersion
+)
 install (FILES
-  "${CMAKE_CURRENT_BINARY_DIR}/project-config-version.cmake"
+  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME_LOWER}Config.cmake"
+  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME_LOWER}ConfigVersion.cmake"
   DESTINATION "${INSTALL_CMAKE_DIR}"
-  RENAME "${PROJECT_NAME_LOWER}-config-version.cmake")
-# Make information about the cmake targets (the library and the tools)
-# available.
+)
 install (EXPORT depends
-  FILE ${PROJECT_NAME_LOWER}-depends.cmake
+  FILE ${PROJECT_NAME_LOWER}Targets.cmake
   DESTINATION "${INSTALL_CMAKE_DIR}")
 
 

libgeotiff/cmake/project-config.cmake.in

@@ -1,10 +1,10 @@
-# Configure @PROJECT_NAME@
-#
+@PACKAGE_INIT@
+
 # Set
 #  @PROJECT_NAME@_FOUND = 1
-#  @PROJECT_NAME@_INCLUDE_DIRS = /usr/local/include
-#  @PROJECT_NAME@_LIBRARY_DIRS = /usr/local/lib
-#  @PROJECT_NAME@_BINARY_DIRS = /usr/local/bin
+#  @PROJECT_NAME@_INCLUDE_DIRS = ${CMAKE_INSTALL_INCLUDEDIR}
+#  @PROJECT_NAME@_LIBRARY_DIRS = ${CMAKE_INSTALL_LIBDIR}
+#  @PROJECT_NAME@_BINARY_DIRS = ${CMAKE_INSTALL_BINDIR}
 #  @PROJECT_NAME@_VERSION = 1.4.1 (for example)
 
 # For compatibility with FindGeoTIFF.cmake, also set
@@ -14,13 +14,9 @@
 # @PROJECT_NAME_UPPER@_LIBRARIES
 
 # Tell the user project where to find our headers and libraries
-get_filename_component (_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
-get_filename_component (_ROOT "${_DIR}/@PROJECT_ROOT_DIR@" ABSOLUTE)
-set (@PROJECT_NAME@_INCLUDE_DIRS "${_ROOT}/include")
-set (@PROJECT_NAME@_LIBRARY_DIRS "${_ROOT}/lib")
-set (@PROJECT_NAME@_BINARY_DIRS "${_ROOT}/bin")
-unset (_ROOT)
-unset (_DIR)
+set (@PROJECT_NAME@_INCLUDE_DIRS @PACKAGE_CMAKE_INSTALL_INCLUDEDIR@)
+set (@PROJECT_NAME@_LIBRARY_DIRS @PACKAGE_CMAKE_INSTALL_LIBDIR@)
+set (@PROJECT_NAME@_BINARY_DIRS @PACKAGE_CMAKE_INSTALL_BINDIR@)
 
 include(CMakeFindDependencyMacro)
 @CONFIG_PUBLIC_DEPENDENCIES@
@@ -46,7 +42,7 @@ if(NOT @PROJECT_NAME@_FIND_QUIETLY)
 endif()
 
 # Read in the exported definition of the library
-include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME_LOWER@-depends.cmake")
+include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME_LOWER@Targets.cmake")
 
 # For compatibility with FindGeoTIFF.cmake
 set (@PROJECT_NAME_UPPER@_FOUND 1)