[WIP] Add simple CMake presets

.github/workflows/ci-linux.yml

@@ -1,6 +1,6 @@
 ---
 name: CI-Linux
 on: [push, pull_request]
 
 jobs:
   build:
@@ -38,19 +38,17 @@
       - name: Configure
         run: |
           export CXX=$(echo ${{ matrix.compiler }} | sed -E 's/^(g|clang)(cc)?/\1++/')
-          cmake -G Ninja -S . -B build
+          cmake --preset default --fresh
 
       - name: Build
-        working-directory: build
-        run: ninja srecord-executables
+        run: cmake --build  --preset srecord-executables
 
       - name: Smoke test
-        working-directory: build
-        run: ninja srecord-executables-version
+        run: cmake --build  --preset srecord-executables-version
 
       - name: Build test prerequisites
-        working-directory: build
-        run: ninja prepare-test
+
+        run: cmake --build  --preset prepare-test
 
       - name: Test
         working-directory: build

.github/workflows/ci-macos.yml

@@ -1,6 +1,6 @@
 ---
 name: CI-MacOS
 on: [push, pull_request]
 
 jobs:
   build:
@@ -19,19 +19,16 @@
       - uses: actions/checkout@v3
 
       - name: Configure
-        run: cmake -G Ninja -S . -B build
+        run: cmake --preset default --fresh
 
       - name: Build
-        working-directory: build
-        run: ninja srecord-executables
+        run: cmake --build  --preset srecord-executables
 
       - name: Smoke test
-        working-directory: build
-        run: ninja srecord-executables-version
+        run: cmake --build  --preset srecord-executables-version
 
       - name: Build test prerequisites
-        working-directory: build
-        run: ninja prepare-test
+        run: cmake --build  --preset prepare-test
 
       - name: Test
         working-directory: build

.github/workflows/ci-windows.yml

@@ -1,6 +1,6 @@
 ---
 name: CI-Windows
 on: [push, pull_request]
 
 jobs:
   build:
@@ -43,19 +43,16 @@
       - uses: actions/checkout@v3
 
       - name: Configure
-        run: cmake -G Ninja -S . -B build
+        run: cmake --preset default --fresh
 
       - name: Build
-        working-directory: build
-        run: ninja srecord-executables
+        run: cmake --build  --preset srecord-executables
 
       - name: Smoke test
-        working-directory: build
-        run: ninja srecord-executables-version
+        run: cmake --build  --preset srecord-executables-version
 
       - name: Build test prerequisites
-        working-directory: build
-        run: ninja prepare-test
+        run: cmake --build  --preset prepare-test
 
       - name: Test
         working-directory: build

.github/workflows/qa.yml

@@ -1,6 +1,6 @@
 ---
 name: QA
 on: [push, pull_request]
 
 jobs:
   build-clang:
@@ -36,25 +36,23 @@
             -Wextra
           SRecord_CMake_Flags: >-
             -D CMAKE_EXPORT_COMPILE_COMMANDS=ON
-        run: cmake -G Ninja -S . -B build ${SRecord_CMake_Flags}
+        run: cmake --preset default --fresh ${SRecord_CMake_Flags}
         # cSpell:enable
 
       - name: Build
-        working-directory: build
         run: ninja -k 0 srecord-executables
 
       - name: Smoke test
-        working-directory: build
-        run: ninja srecord-executables-version
+        run: cmake --build  --preset srecord-executables-version
 
       - name: Build test prerequisites
-        working-directory: build
-        run: ninja prepare-test
+        run: cmake --build  --preset prepare-test
 
       - name: Test
         working-directory: build
         run: ctest --output-on-failure --output-junit ctest.junit.xml
 
+
       - name: clang-tidy
         if: always()
         run: run-clang-tidy-14 -p build -header-filter=.*
@@ -92,25 +90,23 @@
             -Wno-implicit-fallthrough
           SRecord_CMake_Flags: >-
             -D CMAKE_EXPORT_COMPILE_COMMANDS=ON
-        run: cmake -G Ninja -S . -B build ${SRecord_CMake_Flags}
+        run:  cmake --preset default --fresh ${SRecord_CMake_Flags}
         # cSpell:enable
 
       - name: Build
-        working-directory: build
         run: ninja -k 0 srecord-executables
 
       - name: Smoke test
-        working-directory: build
-        run: ninja srecord-executables-version
+        run: cmake --build srecord-executables-version
 
       - name: Build test prerequisites
-        working-directory: build
-        run: ninja prepare-test
+        run: cmake --build prepare-test
 
       - name: Test
         working-directory: build
         run: ctest --output-on-failure --output-junit ctest.junit.xml
 
+
   docs:
     name: Documentation
     runs-on: ubuntu-22.04

CMakePresets.json

@@ -0,0 +1,76 @@
+{
+    "version": 6,
+    "cmakeMinimumRequired": {
+        "major": 3,
+        "minor": 25,
+        "patch": 0
+    },
+    "configurePresets": [
+        {
+          "name": "cmake-pedantic",
+          "hidden": true,
+          "warnings": {
+            "dev": false,
+            "uninitialized": false,
+            "systemVars": false
+          },
+          "errors": {
+            "deprecated": true
+          }
+        },
+        {
+          "name": "ci-build",
+          "binaryDir": "${sourceDir}/build",
+          "hidden": true
+        },
+        {
+            "name": "ninja",
+            "generator": "Ninja",
+            "hidden": true
+          },
+        {
+            "name": "default",
+            "displayName": "Basic configuration",
+            "inherits": ["ci-build", "cmake-pedantic", "ninja"]
+        }
+    ],
+    "buildPresets": [
+        {
+            "name": "default-config-preset",
+            "hidden": true,
+            "configurePreset": "default"
+        },
+        {
+            "name": "clean",
+            "displayName": "Debug build",
+            "targets" : "clean",
+            "inherits": ["default-config-preset"]
+        },
+        {
+            "name": "srecord-executables",
+            "displayName": "Debug build",
+            "targets" : "srecord-executables",
+            "inherits": ["default-config-preset"]
+        },
+        {
+            "name": "srecord-executables-version",
+            "displayName": "Debug build",
+            "inherits": ["default-config-preset"],
+            "targets" : "srecord-executables-version"
+        },
+        {
+            "name": "prepare-test",
+            "displayName": "Debug build",
+            "inherits": ["default-config-preset"],
+            "targets" : "prepare-test"
+        }
+    ],
+    "testPresets": [
+        {
+            "name": "test",
+            "configurePreset": "default",
+            "output": {"outputOnFailure": true, "outputJUnitFile": "ctest.junit.xml"}
+
+        }
+    ]
+}

srecord/arglex.cc

@@ -24,6 +24,7 @@
 #include <cstring>
 #include <iostream>
 #include <unistd.h>
+#include <cstdint>
 
 #include <srecord/arglex.h>
 #include <srecord/progname.h>
@@ -80,7 +81,7 @@ srecord::arglex::read_arguments_file(const char *filename)
         int sc = getc(fp);
         if (sc == EOF)
             break;
-        uint8_t c = sc;
+        std::uint8_t c = sc;
 
         //
         // Ignore white space between words.
@@ -144,10 +145,10 @@ srecord::arglex::compare(const char *formal, const char *actual)
 {
     for (;;)
     {
-        uint8_t ac = *actual++;
+        std::uint8_t ac = *actual++;
         if (isupper(ac))
             ac = tolower(ac);
-        uint8_t fc = *formal++;
+        std::uint8_t fc = *formal++;
         switch (fc)
         {
         case 0:

srecord/arglex/abbreviate.cc

@@ -17,15 +17,15 @@
 //
 
 #include <srecord/arglex.h>
-
+#include <cstdint>
 
 std::string
 srecord::arglex::abbreviate(const char *s)
 {
     std::string result;
     for (;;)
     {
-        uint8_t c = *s++;
+        std::uint8_t c = *s++;
         switch (c)
         {
         case '\0':

srecord/input/file/hexdump.cc

@@ -41,7 +41,7 @@ srecord::input_file_hexdump::get_next_token()
         int sc = get_char();
         if (sc < 0)
             return token_eof;
-        uint8_t c = sc;
+        std::uint8_t c = sc;
         switch (c)
         {
         case '\n':

srecord/input/file/ppx.cc

@@ -17,6 +17,7 @@
 //
 
 #include <cassert>
+#include <cstdint>
 
 #include <srecord/arglex/tool.h>
 #include <srecord/input/file/ppx.h>
@@ -47,7 +48,7 @@ srecord::input_file_ppx::get_next_token()
             token = token_eof;
             return;
         }
-        uint8_t c = sc;
+        std::uint8_t c = sc;
         switch (c)
         {
         case '*':