update presets, install defaults

Author: scivision

.github/workflows/ci.yml

@@ -14,10 +14,11 @@ on:
 jobs:
 
   linux:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     timeout-minutes: 15
     env:
       CTEST_SITE: GitHub_Ubuntu
+      CTEST_PARALLEL_LEVEL: 2
 
     steps:
     - uses: actions/checkout@v2
@@ -27,16 +28,13 @@ jobs:
         sudo apt update -yq
         sudo apt install -yq --no-install-recommends ninja-build gfortran libnetcdff-dev
 
-    - name: CDash
-      run: ctest -S ci.cmake -V
-
-    - name: Install package
-      run: |
-        cmake -B build -DCMAKE_INSTALL_PREFIX:PATH=~/nc4fortran
-        cmake --install build
+    - run: cmake --preset default -DCMAKE_INSTALL_PREFIX=~
+    - run: cmake --build --preset default
+    - run: ctest --preset default
+    - run: cmake --install build
 
     - name: configure examples
-      run: cmake -S Examples -B Examples/build -Dnc4fortran_ROOT:PATH=~/nc4fortran
+      run: cmake -S Examples -B Examples/build -Dnc4fortran_ROOT=~
     - name: build examples
       run: cmake --build Examples/build --parallel
     - name: Test examples
@@ -66,14 +64,16 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ github.event.release.upload_url }}
-        asset_path: build/package/nc4fortran-${{ steps.get_version.outputs.VERSION }}-Linux.tar.gz
-        asset_name:  nc4fortran-${{ steps.get_version.outputs.VERSION }}-Linux.tar.gz
+        asset_path: build/package/nc4fortran-${{ steps.get_version.outputs.VERSION }}-Linux.tar.zst
+        asset_name:  nc4fortran-${{ steps.get_version.outputs.VERSION }}-Linux.tar.zst
         asset_content_type: application/zip
 
 
   linuxCmake313:
     runs-on: ubuntu-latest
     timeout-minutes: 15
+    env:
+      CTEST_PARALLEL_LEVEL: 2
 
     steps:
     - uses: actions/checkout@v2
@@ -91,7 +91,7 @@ jobs:
 
     - run: cmake -B build
     - run: cmake --build build --parallel
-    - run: ctest --parallel 2 --output-on-failure
+    - run: ctest --output-on-failure
       working-directory: build
 
 
@@ -103,21 +103,19 @@ jobs:
       CC: gcc-10
       FC: gfortran-10
       CTEST_SITE: GitHub_MacOS
+      CTEST_PARALLEL_LEVEL: 3
 
     steps:
     - uses: actions/checkout@v2
 
     - run: brew install netcdf ninja
 
-    - name: CDash
-      run: ctest -S ci.cmake -V
-
-    - name: Install package
-      run: |
-        cmake -B build -DCMAKE_INSTALL_PREFIX:PATH=~/nc4fortran
-        cmake --install build
+    - run: cmake --preset gcc10 -DCMAKE_INSTALL_PREFIX=~
+    - run: cmake --build --preset default
+    - run: ctest --preset default
+    - run: cmake --install build
 
-    - run: cmake -S Examples -B Examples/build -Dnc4fortran_ROOT:PATH=~/h5fortran
+    - run: cmake -S Examples -B Examples/build -Dh5fortran_ROOT=~
     - run: cmake --build Examples/build --parallel
     - run: ctest --parallel 2 --output-on-failure
       working-directory: Examples/build
@@ -145,6 +143,6 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ github.event.release.upload_url }}
-        asset_path: build/nc4fortran-${{ steps.get_version.outputs.VERSION }}-Darwin.tar.gz
-        asset_name:  nc4fortran-${{ steps.get_version.outputs.VERSION }}-Darwin.tar.gz
+        asset_path: build/nc4fortran-${{ steps.get_version.outputs.VERSION }}-Darwin.tar.zst
+        asset_name:  nc4fortran-${{ steps.get_version.outputs.VERSION }}-Darwin.tar.zst
         asset_content_type: application/zip

CMakePresets.json

@@ -1,38 +1,33 @@
 {
-"version": 1,
-"cmakeMinimumRequired": {
-  "major": 3,
-  "minor": 19,
-  "patch": 0
+  "version": 2,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 20,
+    "patch": 0
 },
 
 "configurePresets": [
 {
-  "name": "_default", "hidden": true,
+  "name": "default",
   "binaryDir": "${sourceDir}/build",
+  "generator": "Ninja",
   "cacheVariables": {"CMAKE_BUILD_TYPE": "Release"}
 },
 {
-  "name": "ninja", "inherits": "_default",
-  "displayName": "build with Ninja",
-  "description": "Ninja is a faster alternative to Make",
-  "generator": "Ninja"
-},
-{
-  "name": "notest", "inherits": "ninja",
-  "displayName": "build with Ninja, omitting self-tests",
+  "name": "notest", "inherits": "default",
+  "displayName": "omit self-tests",
   "cacheVariables": {"BUILD_TESTING": false}
 },
 {
-  "name": "build", "inherits": "ninja",
+  "name": "build", "inherits": "default",
   "displayName": "build all libraries",
   "description": "Build all external libraries without searching for existing libraries.",
   "cacheVariables": {
     "netcdf_external": "on"
   }
 },
 {
-  "name": "gcc10", "inherits": "ninja",
+  "name": "gcc10", "inherits": "default",
   "displayName": "GCC-10",
   "description": "specify GCC-10 -- helpful for MacOS Homebrew to avoid Clang /usr/bin/gcc",
   "environment": {
@@ -42,30 +37,18 @@
   }
 },
 {
-  "name": "make", "inherits": "_default",
+  "name": "make", "inherits": "default",
   "displayName": "build with GNU Make",
   "generator": "Unix Makefiles"
 },
 {
-  "name": "makegcc10", "inherits": ["make", "gcc10"],
-  "displayName": "build with GNU Make and GCC",
-  "description": "build with GNU Make and GCC -- useful for MacOS"
-},
-{
-  "name": "buildgcc10",
-  "inherits": ["gcc10", "build"],
-  "displayName": "build all libraries: GCC10",
-  "description": "build all libraries with GCC10 to avoid Clang /usr/bin/gcc"
-},
-{
-  "name": "makewin", "inherits": "_default",
+  "name": "makewin", "inherits": "default",
   "displayName": "build with GNU Make: Windows",
   "generator": "MinGW Makefiles"
 },
 {
-  "name": "intel", "inherits": "ninja",
+  "name": "intel", "inherits": "default",
   "displayName": "Intel Classic compiler: Linux/MacOS",
-  "description": "build with Intel Classic on Linux/MacOS",
   "environment": {
     "CC": "icc",
     "CXX": "icpc",
@@ -75,7 +58,6 @@
 {
   "name": "intelwin", "inherits": "intel",
   "displayName": "Intel Classic compiler: Windows",
-  "description": "build with Intel Classic on Windows",
   "environment": {
     "CC": "icl",
     "CXX": "icl"
@@ -84,12 +66,30 @@
 {
   "name": "intelnext", "inherits": "intel",
   "displayName": "Intel oneAPI LLVM",
-  "description": "build with Intel oneAPI NextGen LLVM",
   "environment": {
     "CC": "icx",
     "CXX": "icx",
     "FC": "ifx"
   }
 }
+],
+"buildPresets": [
+  {
+    "name": "default",
+    "configurePreset": "default"
+  }
+],
+"testPresets": [
+{
+  "name": "default",
+  "configurePreset": "default",
+  "output": {
+    "outputOnFailure": true,
+    "verbosity": "default"
+  },
+  "execution": {
+    "noTestsAction": "error",
+    "stopOnFailure": false}
+}
 ]
 }

Examples/CMakeLists.txt

@@ -1,7 +1,6 @@
-cmake_minimum_required(VERSION 3.13...3.20)
+cmake_minimum_required(VERSION 3.13...${CMAKE_VERSION})
 
-project(nc4fortranExample
-LANGUAGES Fortran)
+project(nc4fortranExample LANGUAGES Fortran)
 
 include(CTest)
 

VERSION

@@ -1 +1 @@
-1.2.3
+1.2.4

cmake/install.cmake

@@ -8,11 +8,9 @@ configure_package_config_file(${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in
 
 write_basic_package_version_file(
   ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake
-  VERSION ${${PROJECT_NAME}_VERSION}
   COMPATIBILITY SameMinorVersion)
 
 install(EXPORT ${PROJECT_NAME}Targets
-  FILE ${PROJECT_NAME}Targets.cmake
   NAMESPACE ${PROJECT_NAME}::
   DESTINATION lib/cmake/${PROJECT_NAME})
 
@@ -27,12 +25,8 @@ export(EXPORT ${PROJECT_NAME}Targets
 
 # --- CPack
 
-set(_fmt TGZ)
-if(WIN32)
-  set(_fmt ZIP)
-endif()
-set(CPACK_GENERATOR ${_fmt})
-set(CPACK_SOURCE_GENERATOR ${_fmt})
+set(CPACK_GENERATOR "TZST")
+set(CPACK_SOURCE_GENERATOR "TZST")
 set(CPACK_PACKAGE_VENDOR "Michael Hirsch")
 set(CPACK_PACKAGE_CONTACT "Michael Hirsch")
 set(CPACK_DEBIAN_PACKAGE_DEPENDS "libnetcdff-dev")

cmake/netcdf.cmake

@@ -8,7 +8,7 @@ find_package(HDF5 COMPONENTS C Fortran REQUIRED)
 set(netcdf_external true CACHE BOOL "autobuild NetCDF")
 
 if(NOT DEFINED NetCDF_ROOT)
-  set(NetCDF_ROOT ${PROJECT_BINARY_DIR}/netcdf)
+  set(NetCDF_ROOT ${CMAKE_INSTALL_PREFIX})
 endif()
 
 set(NetCDF_INCLUDE_DIRS ${NetCDF_ROOT}/include)
@@ -27,7 +27,7 @@ endif()
 ExternalProject_Add(NETCDF_C
 URL https://github.com/Unidata/netcdf-c/archive/v4.7.4.zip
 URL_HASH SHA256=170c9c9020f8909811b06e1034d5ea9288b3d5bd90793e3dd27490191faa7566
-TLS_VERIFY ON
+UPDATE_DISCONNECTED ${EP_UPDATE_DISCONNECTED}
 CONFIGURE_HANDLED_BY_BUILD TRUE
 INACTIVITY_TIMEOUT 30
 # Shared_libs=on for netcdf-fortran symbol finding bug
@@ -52,6 +52,7 @@ target_link_libraries(NetCDF::NetCDF_C INTERFACE HDF5::HDF5)
 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

cmake/options.cmake

@@ -2,9 +2,16 @@
 option(netcdf_external "Build HDF5 library")
 option(dev "developer mode")
 
-set(CMAKE_EXPORT_COMPILE_COMMANDS on)
+set(CMAKE_EXPORT_COMPILE_COMMANDS true)
 
-if(NOT dev)
+set(CMAKE_TLS_VERIFY true)
+
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+  set(CMAKE_INSTALL_PREFIX ${PROJECT_BINARY_DIR} CACHE PATH "top-level install path" FORCE)
+endif()
+
+if(dev)
+else()
   set(EP_UPDATE_DISCONNECTED true)
 endif()