improve install

Author: scivision

.github/workflows/ci.yml

@@ -69,7 +69,7 @@ jobs:
         asset_content_type: application/zip
 
 
-  linuxCmake313:
+  linuxCmake314:
     runs-on: ubuntu-latest
     timeout-minutes: 15
     env:
@@ -83,11 +83,11 @@ jobs:
         sudo apt update -yq
         sudo apt install -yq --no-install-recommends gfortran libnetcdff-dev
 
-    - name: get CMake 3.13
+    - name: get CMake 3.14
       run: |
-        curl -L -O https://github.com/Kitware/CMake/releases/download/v3.13.5/cmake-3.13.5-Linux-x86_64.tar.gz
-        tar xf cmake-3.13.5-Linux-x86_64.tar.gz
-        echo "${GITHUB_WORKSPACE}/cmake-3.13.5-Linux-x86_64/bin" >> $GITHUB_PATH
+        curl -L -O https://github.com/Kitware/CMake/releases/download/v3.14.7/cmake-3.14.7-Linux-x86_64.tar.gz
+        tar xf cmake-3.14.7-Linux-x86_64.tar.gz
+        echo "${GITHUB_WORKSPACE}/cmake-3.14.7-Linux-x86_64/bin" >> $GITHUB_PATH
 
     - run: cmake -B build
     - run: cmake --build build --parallel
@@ -110,12 +110,12 @@ jobs:
 
     - run: brew install netcdf ninja
 
-    - run: cmake --preset gcc10 -DCMAKE_INSTALL_PREFIX=~
+    - run: cmake --preset default -DCMAKE_INSTALL_PREFIX=~
     - run: cmake --build --preset default
     - run: ctest --preset default
     - run: cmake --install build
 
-    - run: cmake -S Examples -B Examples/build -Dh5fortran_ROOT=~
+    - run: cmake -S Examples -B Examples/build -Dnc4fortran_ROOT=~
     - run: cmake --build Examples/build --parallel
     - run: ctest --parallel 2 --output-on-failure
       working-directory: Examples/build

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.13...3.20)
+cmake_minimum_required(VERSION 3.14...3.20)
 
 file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/VERSION PROJECT_VERSION
   REGEX "^([0-9]+\.[0-9]+\.[0-9]+)" LIMIT_INPUT 16 LENGTH_MAXIMUM 16 LIMIT_COUNT 1)
@@ -50,10 +50,7 @@ target_link_libraries(nc4fortran::nc4fortran INTERFACE nc4fortran)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/nc4fortran.mod
   DESTINATION include)
 
-install(TARGETS nc4fortran
-  EXPORT ${PROJECT_NAME}Targets
-  ARCHIVE DESTINATION lib
-  LIBRARY DESTINATION lib)
+install(TARGETS nc4fortran EXPORT ${PROJECT_NAME}Targets)
 
 # additional Find*.cmake necesary
 install(FILES

CMakePresets.json

@@ -26,16 +26,6 @@
     "netcdf_external": "on"
   }
 },
-{
-  "name": "gcc10", "inherits": "default",
-  "displayName": "GCC-10",
-  "description": "specify GCC-10 -- helpful for MacOS Homebrew to avoid Clang /usr/bin/gcc",
-  "environment": {
-    "CC": "gcc-10",
-    "CXX": "g++-10",
-    "FC": "gfortran-10"
-  }
-},
 {
   "name": "make", "inherits": "default",
   "displayName": "build with GNU Make",

Examples/CMakeLists.txt

@@ -6,10 +6,6 @@ include(CTest)
 
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../cmake/Modules)
 
-if(NOT nc4fortran_ROOT AND NOT DEFINED ENV{nc4fortran_ROOT})
-  set(nc4fortran_ROOT ${PROJECT_SOURCE_DIR}/../build)
-endif()
-
 find_package(nc4fortran REQUIRED)
 
 # --- Fortran interface for examples

VERSION

@@ -1 +1 @@
-1.2.4
+1.2.5

cmake/Config.cmake.in

@@ -5,6 +5,6 @@ include(CMakeFindDependencyMacro)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/../Modules)
 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/Modules/FindHDF5.cmake

@@ -30,6 +30,9 @@ Components
 
 ``Fortran``
 
+The ``HL`` component is implied and silently accepted to keep
+compatibility with factory FindHDF5
+
 
 Targets
 ^^^^^^^
@@ -81,7 +84,7 @@ if( "${_def}" MATCHES
   set(HDF5_VERSION ${HDF5_VERSION} PARENT_SCOPE)
 endif()
 
-# this help avoid picking up miniconda zlib over the desired zlib
+# this helps avoid picking up miniconda zlib over the desired zlib
 get_filename_component(_hint ${HDF5_C_LIBRARY} DIRECTORY)
 if(NOT ZLIB_ROOT)
   set(ZLIB_ROOT "${_hint}/..;${_hint}/../..")

cmake/compilers.cmake

@@ -18,16 +18,16 @@ endif()
 if(CMAKE_Fortran_COMPILER_ID STREQUAL Intel)
   if(WIN32)
     # add_compile_options(/Qdiag-error-limit:3)
-    string(APPEND CMAKE_Fortran_FLAGS " /traceback /warn /heap-arrays")
-    string(APPEND CMAKE_Fortran_FLAGS_DEBUG " /check:bounds /debug:all")
+    string(APPEND CMAKE_Fortran_FLAGS " /warn /heap-arrays")
+    string(APPEND CMAKE_Fortran_FLAGS_DEBUG " /traceback /check:bounds /debug:all")
   else()
     # add_compile_options(-diag-error-limit=3)
-    string(APPEND CMAKE_Fortran_FLAGS " -traceback -warn -heap-arrays")
-    string(APPEND CMAKE_Fortran_FLAGS_DEBUG " -check all -debug extended")
+    string(APPEND CMAKE_Fortran_FLAGS " -warn -heap-arrays")
+    string(APPEND CMAKE_Fortran_FLAGS_DEBUG " -traceback -check all -debug extended")
   endif()
 elseif(CMAKE_Fortran_COMPILER_ID STREQUAL GNU)
   string(APPEND CMAKE_Fortran_FLAGS " -mtune=native -Wall -fimplicit-none")
-  string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -Wno-maybe-uninitialized")
+  string(APPEND CMAKE_Fortran_FLAGS_RELEASE " -fno-backtrace -Wno-maybe-uninitialized")
   string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO " -Wno-maybe-uninitialized")
   string(APPEND CMAKE_Fortran_FLAGS_DEBUG " -Wextra -fcheck=all -Werror=array-bounds")
 elseif(CMAKE_Fortran_COMPILER_ID STREQUAL NAG)

cmake/install.cmake

@@ -19,10 +19,6 @@ install(FILES
   ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake
   DESTINATION lib/cmake/${PROJECT_NAME})
 
-export(EXPORT ${PROJECT_NAME}Targets
-  FILE ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}Targets.cmake
-  NAMESPACE ${PROJECT_NAME}::)
-
 # --- CPack
 
 set(CPACK_GENERATOR "TZST")

cmake/netcdf.cmake

@@ -7,8 +7,13 @@ find_package(HDF5 COMPONENTS C Fortran REQUIRED)
 
 set(netcdf_external true CACHE BOOL "autobuild NetCDF")
 
-if(NOT DEFINED NetCDF_ROOT)
-  set(NetCDF_ROOT ${CMAKE_INSTALL_PREFIX})
+# need to be sure _ROOT isn't empty, defined is not enough
+if(NOT NetCDF_ROOT)
+  if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    set(NetCDF_ROOT ${PROJECT_BINARY_DIR})
+  else()
+    set(NetCDF_ROOT ${CMAKE_INSTALL_PREFIX})
+  endif()
 endif()
 
 set(NetCDF_INCLUDE_DIRS ${NetCDF_ROOT}/include)
@@ -53,7 +58,6 @@ ExternalProject_Add(NETCDF_FORTRAN
 URL https://github.com/Unidata/netcdf-fortran/archive/v4.5.3.zip
 URL_HASH SHA256=a2b9395622ba7411037ca153ad3a6d0824f445b238f1f5c3d3352f8ab7f3117b
 UPDATE_DISCONNECTED ${EP_UPDATE_DISCONNECTED}
-TLS_VERIFY ON
 CONFIGURE_HANDLED_BY_BUILD ON
 INACTIVITY_TIMEOUT 30
 # Shared_libs=on for netcdf-fortran symbol finding bug