Merge pull request #60 from Goddard-Fortran-Ecosystem/develop

Develop

Author: tclune

CMakeLists.txt

@@ -42,9 +42,9 @@ if (PFUNIT)
    add_subdirectory(tests)
 endif ()
 
-configure_file(GFTL-config-version.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/GFTL-config-version.cmake @ONLY)
-configure_file(GFTL-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/GFTL-config.cmake @ONLY)
+configure_file(GFTLConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/GFTLConfig.cmake @ONLY)
+configure_file(GFTLConfig-version.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/GFTLConfig-version.cmake @ONLY)
 install (
-  FILES ${CMAKE_CURRENT_BINARY_DIR}/GFTL-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/GFTL-config-version.cmake
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/GFTLConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/GFTLConfig-version.cmake
   DESTINATION "GFTL-${GFTL_VERSION_MAJOR}.${GFTL_VERSION_MINOR}/cmake"
   )

GFTL-config-version.cmake.in GFTLConfig-version.cmake.in

@@ -2,4 +2,4 @@
 
 get_filename_component (SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
 set (PREFIX ${SELF_DIR}/../..)
-include ("${PREFIX}/GFTL-@GFTL_VERSION_MAJOR@.@GFTL_VERSION_MINOR@/include/GFTL.cmake")
+include ("${PREFIX}/GFTL-@GFTL_VERSION_MAJOR@.@GFTL_VERSION_MINOR@/cmake/GFTL.cmake")

GFTL-config.cmake.in GFTLConfig.cmake.in

@@ -1,8 +1,8 @@
 add_library (gftl INTERFACE)
-set (include_dest "GFTL-${GFTL_VERSION_MAJOR}.${GFTL_VERSION_MINOR}/include")
+set (dest "GFTL-${GFTL_VERSION_MAJOR}.${GFTL_VERSION_MINOR}")
 target_include_directories (gftl INTERFACE
   $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> # for headers when building
-  $<INSTALL_INTERFACE:${include_dest}> # for client in install mode
+  $<INSTALL_INTERFACE:${dest}/include> # for client in install mode
 )
 
 add_subdirectory (templates)
@@ -19,7 +19,7 @@ add_custom_command(
 add_custom_target (force-generation-of-includes ALL)
 add_dependencies (force-generation-of-includes gftl)
 
-install (TARGETS gftl EXPORT GFTL DESTINATION "${include_dest}")
-install (EXPORT GFTL DESTINATION "${include_dest}")
+install (TARGETS gftl EXPORT GFTL DESTINATION "${dest}/include")
+install (EXPORT GFTL DESTINATION "${dest}/cmake")
 
 

include/CMakeLists.txt

@@ -47,7 +47,7 @@ set_source_files_properties (${generated_incs} PROPERTIES GENERATED TRUE)
 
 file (COPY DIRECTORY . DESTINATION . FILES_MATCHING PATTERN "*.inc")
 
-install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ DESTINATION "${include_dest}/templates"
+install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ DESTINATION "${dest}/include/templates"
   FILES_MATCHING PATTERN "*.inc"
   PATTERN CMakeFiles EXCLUDE
   )

include/templates/CMakeLists.txt

@@ -63,7 +63,7 @@ add_dependencies (gftl generate-type-incs)
 
 set_source_files_properties (${generated_incs} PROPERTIES GENERATED TRUE)
 
-install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ DESTINATION "${include_dest}/types"
+install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ DESTINATION "${dest}/include/types"
   FILES_MATCHING PATTERN "*.inc"
   PATTERN CMakeFiles EXCLUDE
   )