modernize/flatten install

Author: scivision

CMakeLists.txt

@@ -59,17 +59,17 @@ set_target_properties(nc4fortran PROPERTIES
 add_library(nc4fortran::nc4fortran INTERFACE IMPORTED GLOBAL)
 target_link_libraries(nc4fortran::nc4fortran INTERFACE nc4fortran)
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/nc4fortran.mod
-  TYPE INCLUDE)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/nc4fortran.mod TYPE INCLUDE)
 
-install(TARGETS nc4fortran EXPORT ${PROJECT_NAME}Targets)
+install(TARGETS nc4fortran EXPORT ${PROJECT_NAME}-targets)
 
 # additional Find*.cmake necessary
 install(FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindHDF5.cmake
-  ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindSZIP.cmake
-  ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindNetCDF.cmake
-  DESTINATION lib/cmake/Modules)
+${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindHDF5.cmake
+${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindSZIP.cmake
+${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindNetCDF.cmake
+DESTINATION cmake
+)
 
 
 add_subdirectory(src)

cmake/Config.cmake.in renamed to cmake/config.cmake.in

@@ -2,9 +2,10 @@
 
 include(CMakeFindDependencyMacro)
 
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/../Modules)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+
 find_dependency(NetCDF COMPONENTS Fortran)
 
-include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-targets.cmake)
 
 check_required_components(@PROJECT_NAME@)

cmake/install.cmake

@@ -2,25 +2,22 @@
 
 include(CMakePackageConfigHelpers)
 
-configure_package_config_file(${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in
-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}Config.cmake
-  INSTALL_DESTINATION lib)
+configure_package_config_file(${CMAKE_CURRENT_LIST_DIR}/config.cmake.in
+  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}-config.cmake
+  INSTALL_DESTINATION cmake)
 
 write_basic_package_version_file(
-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}ConfigVersion.cmake
+  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}-config-version.cmake
   COMPATIBILITY SameMinorVersion)
 
-install(EXPORT ${PROJECT_NAME}Targets
+install(EXPORT ${PROJECT_NAME}-targets
   NAMESPACE ${PROJECT_NAME}::
-  DESTINATION lib/cmake/${PROJECT_NAME})
+  DESTINATION cmake)
 
 install(FILES
-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}Config.cmake
-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}ConfigVersion.cmake
-  DESTINATION lib/cmake/${PROJECT_NAME})
-
-# instead of export() which would need duplicates everywhere of install() calls,
-# just default install to build dir.
+  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}-config.cmake
+  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}-config-version.cmake
+  DESTINATION cmake)
 
 # --- CPack
 

cmake/libraries.cmake

@@ -4,7 +4,6 @@ file(READ ${CMAKE_CURRENT_LIST_DIR}/libraries.json _libj)
 
 foreach(n ${names})
   foreach(t url sha256)
-    string(JSON m GET ${_libj} ${n} ${t})
-    set(${n}_${t} ${m})
+    string(JSON ${n}_${t} GET ${_libj} ${n} ${t})
   endforeach()
 endforeach()

cmake/pkgconf.cmake

@@ -5,4 +5,4 @@ set(pc_requires "netcdf-fortran")
 set(pc_filename ${PROJECT_NAME}.pc)
 configure_file(${CMAKE_CURRENT_LIST_DIR}/pkgconf.pc.in ${pc_filename} @ONLY)
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${pc_filename} DESTINATION lib/pkgconfig)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${pc_filename} DESTINATION pkgconfig)