WIP: Avoid writing `global.h` into the source directory

Writing this file into the source directory is very annoying because when it changes these changes occur on all repositories. WIP because this is hard to do without breaking compatibility.
2024-02-06 18:55:05 +01:00
18 changed files with 84 additions and 310 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -96,6 +96,10 @@ set(CMAKE_TEMPLATE_FILES
    cmake/templates/global.h.in
    cmake/templates/version.h.in
    cmake/templates/template.pc.in)
+set(SCRIPT_FILES)
+if (MINGW)
+    list(APPEND SCRIPT_FILES scripts/wine.sh)
+endif ()
 if (WIN32)
    list(APPEND CMAKE_TEMPLATE_FILES cmake/templates/windows.rc.in cmake/templates/windows-cli-wrapper.rc.in
         cmake/templates/cli-wrapper.cpp)
@ -117,7 +121,7 @@ set(META_APP_URL "https://github.com/${META_APP_AUTHOR}/${META_PROJECT_NAME}")
 set(META_APP_DESCRIPTION "Useful C++ classes and routines such as argument parser, IO and conversion utilities")
 set(META_VERSION_MAJOR 5)
 set(META_VERSION_MINOR 24)
-set(META_VERSION_PATCH 9)
+set(META_VERSION_PATCH 6)

 # find required 3rd party libraries
 include(3rdParty)
--- a/CMakePresets.json
+++ b/CMakePresets.json
@ -22,23 +22,14 @@
      }
    },
    {
-      "name": "clang",
+      "name": "libc++",
      "inherits": "default",
-      "displayName": "Use clang/clang++",
-      "description": "Enforces use of clang/clang++ even when it is not the system default",
-      "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/default-clang",
+      "displayName": "Use clang++ and libc++",
+      "description": "Enforces use of clang++ and libc++ even when it is not the system default",
+      "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/default-no-webview",
      "cacheVariables": {
        "CMAKE_C_COMPILER": {"type": "STRING", "value": "clang"},
-        "CMAKE_CXX_COMPILER": {"type": "STRING", "value": "clang++"}
-      }
-    },
-    {
-      "name": "libc++",
-      "inherits": "clang",
-      "displayName": "Use clang/clang++ and libc++",
-      "description": "Enforces use of clang/clang++ and libc++ even when it is not the system default",
-      "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/default-clang-libc++",
-      "cacheVariables": {
+        "CMAKE_CXX_COMPILER": {"type": "STRING", "value": "clang++"},
        "CMAKE_CXX_FLAGS": {"type": "STRING", "value": "$env{CXXFLAGS} -stdlib=libc++"}
      }
    },
@ -90,13 +81,6 @@
        "CONFIGURATION_TARGET_SUFFIX": {"type": "STRING", "value": "devel"}
      }
    },
-    {
-      "name": "devel-clang",
-      "inherits": ["devel", "clang"],
-      "displayName": "Development config using clang",
-      "description": "Combination of devel and libc++",
-      "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/devel-clang"
-    },
    {
      "name": "devel-libc++",
      "inherits": ["devel", "libc++"],
@ -132,13 +116,6 @@
        "CMAKE_UNITY_BUILD": {"type": "BOOL", "value": "ON"}
      }
    },
-    {
-      "name": "devel-clang-qt6",
-      "inherits": ["qt6", "devel-clang"],
-      "displayName": "Development config using clang and Qt 6",
-      "description": "Combination of qt6 and devel-clang",
-      "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/devel-clang-qt6"
-    },
    {
      "name": "devel-libc++-qt6",
      "inherits": ["qt6", "devel-libc++"],
@ -185,42 +162,9 @@
        "CMAKE_INSTALL_PREFIX": {"type": "PATH", "value": "$env{KDE_INSTALL_DIR}"}
      }
    },
-    {
-      "name": "arch-*-w64-mingw32",
-      "inherits": ["no-webview", "no-kde"],
-      "environment": {
-        "CPPFLAGS": "-D_FORTIFY_SOURCE=3 -D_GLIBCXX_ASSERTIONS",
-        "CFLAGS": "$env{CPPFLAGS} -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4 -Wformat -Werror=format-security -fcf-protection",
-        "CXXFLAGS": "$env{CPPFLAGS} -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4 -Wformat -Werror=format-security -fcf-protection",
-        "LDFLAGS": "-Wl,-O1,--sort-common,--as-needed -fstack-protector"
-      },
-      "cacheVariables": {
-        "BUILD_SHARED_LIBS": {"type": "BOOL", "value": "ON"},
-        "VERSIONED_MINGW_LIBRARIES": {"type": "BOOL", "value": "ON"},
-        "ENABLE_TARGETS_FOR_MINGW_CROSS_PACKAGING": {"type": "BOOL", "value": "ON"}
-      }
-    },
-    {
-      "name": "arch-i686-w64-mingw32",
-      "inherits": "arch-*-w64-mingw32",
-      "displayName": "Target i686-w64-mingw32 using Arch Linux's mingw-w64 packaging",
-      "description": "Build targeting i686-w64-mingw32, paths and flags are specific to Arch Linux's mingw-w64 packaging",
-      "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/arch-i686-w64-mingw32",
-      "toolchainFile": "/usr/share/mingw/toolchain-i686-w64-mingw32.cmake",
-      "environment": {
-        "CROSS_TOOL_PREFIX": "i686-w64-mingw32-",
-        "CROSS_INSTALL_PREFIX": "/usr/i686-w64-mingw32",
-        "PATH": "$env{CROSS_INSTALL_PREFIX}/bin:$penv{PATH}"
-      },
-      "cacheVariables": {
-        "CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES": {"type": "PATH", "value": "$env{CROSS_INSTALL_PREFIX}/include"},
-        "CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES": {"type": "PATH", "value": "$env{CROSS_INSTALL_PREFIX}/include"},
-        "CMAKE_CROSSCOMPILING_EMULATOR": {"type": "PATH", "value": "/usr/bin/i686-w64-mingw32-wine"}
-      }
-    },
    {
      "name": "arch-x86_64-w64-mingw32",
-      "inherits": "arch-*-w64-mingw32",
+      "inherits": ["no-webview", "no-kde"],
      "displayName": "Target x86_64-w64-mingw32 using Arch Linux's mingw-w64 packaging",
      "description": "Build targeting x86_64-w64-mingw32, paths and flags are specific to Arch Linux's mingw-w64 packaging",
      "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/arch-x86_64-w64-mingw32",
@ -228,28 +172,20 @@
      "environment": {
        "CROSS_TOOL_PREFIX": "x86_64-w64-mingw32-",
        "CROSS_INSTALL_PREFIX": "/usr/x86_64-w64-mingw32",
+        "CPPFLAGS": "-D_FORTIFY_SOURCE=3 -D_GLIBCXX_ASSERTIONS",
+        "CFLAGS": "$env{CPPFLAGS} -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4 -Wformat -Werror=format-security -fcf-protection",
+        "CXXFLAGS": "$env{CPPFLAGS} -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4 -Wformat -Werror=format-security -fcf-protection",
+        "LDFLAGS": "-Wl,-O1,--sort-common,--as-needed -fstack-protector",
        "PATH": "$env{CROSS_INSTALL_PREFIX}/bin:$penv{PATH}"
      },
      "cacheVariables": {
+        "BUILD_SHARED_LIBS": {"type": "BOOL", "value": "ON"},
+        "VERSIONED_MINGW_LIBRARIES": {"type": "BOOL", "value": "ON"},
        "CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES": {"type": "PATH", "value": "$env{CROSS_INSTALL_PREFIX}/include"},
        "CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES": {"type": "PATH", "value": "$env{CROSS_INSTALL_PREFIX}/include"},
        "CMAKE_CROSSCOMPILING_EMULATOR": {"type": "PATH", "value": "/usr/bin/x86_64-w64-mingw32-wine"}
      }
    },
-    {
-      "name": "arch-i686-w64-mingw32-static",
-      "inherits": "arch-i686-w64-mingw32",
-      "displayName": "Target i686-w64-mingw32 using Arch Linux's mingw-w64 packaging (static)",
-      "description": "Build targeting i686-w64-mingw32, paths and flags are specific to Arch Linux's mingw-w64 packaging",
-      "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/arch-i686-w64-mingw32-static",
-      "toolchainFile": "/usr/share/mingw/toolchain-i686-w64-mingw32-static.cmake",
-      "cacheVariables": {
-        "BUILD_SHARED_LIBS": {"type": "BOOL", "value": "OFF"},
-        "CMAKE_FIND_LIBRARY_SUFFIXES": {"type": "STRING", "value": ".a;.lib"},
-        "STATIC_LIBRARY_LINKAGE": {"type": "BOOL", "value": "ON"},
-        "STATIC_LINKAGE": {"type": "BOOL", "value": "ON"}
-      }
-    },
    {
      "name": "arch-x86_64-w64-mingw32-static",
      "inherits": "arch-x86_64-w64-mingw32",
@ -258,19 +194,9 @@
      "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/arch-x86_64-w64-mingw32-static",
      "toolchainFile": "/usr/share/mingw/toolchain-x86_64-w64-mingw32-static.cmake",
      "cacheVariables": {
-        "BUILD_SHARED_LIBS": {"type": "BOOL", "value": "OFF"},
-        "CMAKE_FIND_LIBRARY_SUFFIXES": {"type": "STRING", "value": ".a;.lib"},
-        "STATIC_LIBRARY_LINKAGE": {"type": "BOOL", "value": "ON"},
-        "STATIC_LINKAGE": {"type": "BOOL", "value": "ON"}
+        "BUILD_SHARED_LIBS": {"type": "BOOL", "value": "OFF"}
      }
    },
-    {
-      "name": "arch-i686-w64-mingw32-qt6",
-      "inherits": ["qt6", "arch-i686-w64-mingw32"],
-      "displayName": "Combination of qt6 and arch-i686-w64-mingw32",
-      "description": "See description of qt6 and arch-i686-w64-mingw32",
-      "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/arch-i686-w64-mingw32-qt6"
-    },
    {
      "name": "arch-x86_64-w64-mingw32-qt6",
      "inherits": ["qt6", "arch-x86_64-w64-mingw32"],
@ -278,13 +204,6 @@
      "description": "See description of qt6 and arch-x86_64-w64-mingw32",
      "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/arch-x86_64-w64-mingw32-qt6"
    },
-    {
-      "name": "arch-i686-w64-mingw32-static-qt6",
-      "inherits": ["qt6", "arch-i686-w64-mingw32-static"],
-      "displayName": "Combination of qt6 and arch-i686-w64-mingw32-static",
-      "description": "See description of qt6 and arch-i686-w64-mingw32-static",
-      "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/arch-i686-w64-mingw32-static-qt6"
-    },
    {
      "name": "arch-x86_64-w64-mingw32-static-qt6",
      "inherits": ["qt6", "arch-x86_64-w64-mingw32-static"],
@ -292,13 +211,6 @@
      "description": "See description of qt6 and arch-x86_64-w64-mingw32-static",
      "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/arch-x86_64-w64-mingw32-static-qt6"
    },
-    {
-      "name": "arch-i686-w64-mingw32-devel",
-      "inherits": ["devel", "arch-i686-w64-mingw32"],
-      "displayName": "Combination of devel and arch-i686-w64-mingw32",
-      "description": "See descriptions of devel and arch-i686-w64-mingw32",
-      "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/arch-i686-w64-mingw32-devel"
-    },
    {
      "name": "arch-x86_64-w64-mingw32-devel",
      "inherits": ["devel", "arch-x86_64-w64-mingw32"],
@ -306,34 +218,6 @@
      "description": "See descriptions of devel and arch-x86_64-w64-mingw32",
      "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/arch-x86_64-w64-mingw32-devel"
    },
-    {
-      "name": "arch-i686-w64-mingw32-devel-qt6",
-      "inherits": ["qt6", "devel", "arch-i686-w64-mingw32"],
-      "displayName": "Combination of qt6, devel and arch-i686-w64-mingw32",
-      "description": "See descriptions of devel and arch-i686-w64-mingw32",
-      "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/arch-i686-w64-mingw32-devel"
-    },
-    {
-      "name": "arch-x86_64-w64-mingw32-devel-qt6",
-      "inherits": ["qt6", "devel", "arch-x86_64-w64-mingw32"],
-      "displayName": "Combination of qt6, devel and arch-x86_64-w64-mingw32",
-      "description": "See descriptions of devel and arch-x86_64-w64-mingw32",
-      "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/arch-x86_64-w64-mingw32-devel"
-    },
-    {
-      "name": "arch-i686-w64-mingw32-static-devel-qt6",
-      "inherits": ["qt6", "devel", "arch-i686-w64-mingw32-static"],
-      "displayName": "Combination of qt6, devel and arch-i686-w64-mingw32-static",
-      "description": "See descriptions of devel and arch-i686-w64-mingw32-static",
-      "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/arch-i686-w64-mingw32-devel"
-    },
-    {
-      "name": "arch-x86_64-w64-mingw32-static-devel-qt6",
-      "inherits": ["qt6", "devel", "arch-x86_64-w64-mingw32-static"],
-      "displayName": "Combination of qt6, devel and arch-x86_64-w64-mingw32-static",
-      "description": "See descriptions of devel and arch-x86_64-w64-mingw32-static",
-      "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/arch-x86_64-w64-mingw32-devel"
-    },
    {
      "name": "arch-static-compat",
      "inherits": ["no-webview", "no-kde", "qt6"],
@ -375,38 +259,6 @@
      "description": "See descriptions of devel and arch-static-compat",
      "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/arch-static-compat-devel"
    },
-    {
-      "name": "arch-android",
-      "inherits": ["no-webview", "no-kde", "qt6"],
-      "displayName": "Target *-linux-android using Arch Linux's Android packaging (invoke e.g. \"source android-env aarch64\" before invoking CMake)",
-      "description": "Build targeting Android, paths and flags are specific to Arch Linux's Android packaging, invoke e.g. \"source android-env aarch64\" for required environment variables",
-      "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/arch-android-$env{ANDROID_ABI}",
-      "toolchainFile": "$env{ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake",
-      "environment": {
-        "PATH": "$env{ANDROID_PREFIX}/bin:$penv{PATH}"
-      },
-      "cacheVariables": {
-        "ANDROID_ABI": {"type": "STRING", "value": "$env{ANDROID_ABI}"},
-        "ANDROID_SDK_ROOT": {"type": "STRING", "value": "$env{ANDROID_HOME}"},
-        "ANDROID_NDK": {"type": "STRING", "value": "$env{ANDROID_NDK_HOME}"},
-        "ANDROID_NATIVE_API_LEVEL": {"type": "STRING", "value": "$env{ANDROID_MINIMUM_PLATFORM}"},
-        "ANDROID_TOOLCHAIN": {"type": "STRING", "value": "clang"},
-        "CMAKE_BUILD_TYPE": {"type": "STRING", "value": "Release"},
-        "CMAKE_C_FLAGS_RELEASE": {"type": "STRING", "value": "$env{ANDROID_CFLAGS}"},
-        "CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES": {"type": "PATH", "value": "$env{ANDROID_PREFIX_INCLUDE}"},
-        "CMAKE_CXX_FLAGS_RELEASE": {"type": "STRING", "value": "$env{ANDROID_CXXFLAGS}"},
-        "CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES": {"type": "PATH", "value": "$env{ANDROID_PREFIX_INCLUDE}"},
-        "CMAKE_SHARED_LINKER_FLAGS_RELEASE": {"type": "STRING", "value": "$env{ANDROID_LDFLAGS}"},
-        "CMAKE_FIND_ROOT_PATH": {"type": "PATH", "value": "$env{ANDROID_PREFIX}"},
-        "CMAKE_INSTALL_PREFIX": {"type": "PATH", "value": "$env{ANDROID_PREFIX}"},
-        "CMAKE_INSTALL_LIBDIR": {"type": "PATH", "value": "lib"},
-        "INCLUDE_INSTALL_DIR": {"type": "PATH", "value": "$env{ANDROID_PREFIX_INCLUDE}"},
-        "LIB_INSTALL_DIR": {"type": "PATH", "value": "$env{ANDROID_PREFIX_LIB}"},
-        "SYSCONF_INSTALL_DIR": {"type": "PATH", "value": "$env{ANDROID_PREFIX_ETC}"},
-        "SHARE_INSTALL_DIR": {"type": "PATH", "value": "$env{ANDROID_PREFIX_SHARE}"},
-        "PKG_CONFIG_EXECUTABLE": {"type": "FILEPATH", "value": "/usr/bin/$env{ANDROID_PKGCONFIG}"}
-      }
-    },
    {
      "name": "win-x64-msvc-static",
      "inherits": ["no-webview", "no-kde", "qt6"],
@ -414,10 +266,10 @@
      "description": "Build on Windows targeting x64-windows-static using MSVC, Qt 6 (for Qt libs and CMake/Ninja), vcpkg (for other dependencies) and MSYS2 (for Perl, Go, ffmpeg and other tools)",
      "binaryDir": "$env{BUILD_DIR}/${sourceDirName}/win-x64-msvc-static",
      "environment": {
+
        "INCLUDE": "$env{MSVC_ROOT}/include;$env{MSVC_ROOT}/ATLMFC/include;$env{WIN_KITS_ROOT}/include/$env{WIN_KITS_VERSION}/ucrt;$env{WIN_KITS_ROOT}//include/$env{WIN_KITS_VERSION}//um;$env{WIN_KITS_ROOT}//include/$env{WIN_KITS_VERSION}//shared;$env{WIN_KITS_ROOT}/include/$env{WIN_KITS_VERSION}//winrt;$env{WIN_KITS_ROOT}/include/$env{WIN_KITS_VERSION}//cppwinrt",
        "LIB": "$env{MSVC_ROOT}/ATLMFC/lib/x64;$env{MSVC_ROOT}/lib/x64;$env{WIN_KITS_ROOT}/lib/$env{WIN_KITS_VERSION}/ucrt/x64;$env{WIN_KITS_ROOT}/lib/$env{WIN_KITS_VERSION}//um/x64",
-        "LIBPATH": "$env{MSVC_ROOT}/ATLMFC/lib/x64;$env{MSVC_ROOT}/lib/x64;$env{WIN_KITS_ROOT}/lib/$env{WIN_KITS_VERSION}/ucrt/x64;$env{WIN_KITS_ROOT}/lib/$env{WIN_KITS_VERSION}/um/x64",
-        "GOROOT": "$env{MSYS2_ROOT}/mingw64/lib/go"
+        "LIBPATH": "$env{MSVC_ROOT}/ATLMFC/lib/x64;$env{MSVC_ROOT}/lib/x64;$env{WIN_KITS_ROOT}/lib/$env{WIN_KITS_VERSION}/ucrt/x64;$env{WIN_KITS_ROOT}/lib/$env{WIN_KITS_VERSION}/um/x64"
      },
      "cacheVariables": {
        "BUILD_SHARED_LIBS": {"type": "BOOL", "value": "OFF"},
@ -442,6 +294,7 @@
        "DOXYGEN_BIN": {"type": "FILEPATH", "value": "$env{MSYS2_ROOT}/mingw64/bin/doxygen.exe"},
        "CLANG_FORMAT_BIN": {"type": "FILEPATH", "value": "$env{MSYS2_ROOT}/mingw64/bin/clang-format.exe"},
        "GO_BIN": {"type": "FILEPATH", "value": "$env{MSYS2_ROOT}/mingw64/bin/go.exe"},
+        "GOROOT": {"type": "PATH", "value": "$env{MSYS2_ROOT}/mingw64/lib/go"},
        "FFMPEG_BIN": {"type": "FILEPATH", "value": "$env{MSYS2_ROOT}/mingw64/bin/ffmpeg.exe"},
        "REALPATH_BIN": {"type": "FILEPATH", "value": "$env{MSYS2_ROOT}/usr/bin/realpath.exe"},
        "FORCE_EXTERNAL_ICONV": {"type": "BOOL", "value": "ON"},
@ -481,33 +334,21 @@
    {"name": "libc++", "configurePreset": "libc++"},
    {"name": "qt6", "configurePreset": "qt6"},
    {"name": "devel", "configurePreset": "devel"},
-    {"name": "devel-clang", "configurePreset": "devel-clang"},
    {"name": "devel-libc++", "configurePreset": "devel-libc++"},
    {"name": "devel-qt6", "configurePreset": "devel-qt6"},
    {"name": "devel-unity", "configurePreset": "devel-unity"},
-    {"name": "devel-clang-qt6", "configurePreset": "devel-clang-qt6"},
    {"name": "devel-libc++-qt6", "configurePreset": "devel-libc++-qt6"},
    {"name": "debug", "configurePreset": "debug"},
    {"name": "debug-qt6", "configurePreset": "debug-qt6"},
    {"name": "debug-kde", "configurePreset": "debug-kde"},
    {"name": "debug-kde-custom", "configurePreset": "debug-kde-custom"},
-    {"name": "arch-i686-w64-mingw32", "configurePreset": "arch-i686-w64-mingw32"},
    {"name": "arch-x86_64-w64-mingw32", "configurePreset": "arch-x86_64-w64-mingw32"},
-    {"name": "arch-i686-w64-mingw32-static", "configurePreset": "arch-i686-w64-mingw32-static"},
    {"name": "arch-x86_64-w64-mingw32-static", "configurePreset": "arch-x86_64-w64-mingw32-static"},
-    {"name": "arch-i686-w64-mingw32-qt6", "configurePreset": "arch-i686-w64-mingw32-qt6"},
    {"name": "arch-x86_64-w64-mingw32-qt6", "configurePreset": "arch-x86_64-w64-mingw32-qt6"},
-    {"name": "arch-i686-w64-mingw32-static-qt6", "configurePreset": "arch-i686-w64-mingw32-static-qt6"},
    {"name": "arch-x86_64-w64-mingw32-static-qt6", "configurePreset": "arch-x86_64-w64-mingw32-static-qt6"},
-    {"name": "arch-i686-w64-mingw32-devel", "configurePreset": "arch-i686-w64-mingw32-devel"},
    {"name": "arch-x86_64-w64-mingw32-devel", "configurePreset": "arch-x86_64-w64-mingw32-devel"},
-    {"name": "arch-i686-w64-mingw32-devel-qt6", "configurePreset": "arch-i686-w64-mingw32-devel-qt6"},
-    {"name": "arch-x86_64-w64-mingw32-devel-qt6", "configurePreset": "arch-x86_64-w64-mingw32-devel-qt6"},
-    {"name": "arch-i686-w64-mingw32-static-devel-qt6", "configurePreset": "arch-i686-w64-mingw32-static-devel-qt6"},
-    {"name": "arch-x86_64-w64-mingw32-static-devel-qt6", "configurePreset": "arch-x86_64-w64-mingw32-static-devel-qt6"},
    {"name": "arch-static-compat", "configurePreset": "arch-static-compat"},
    {"name": "arch-static-compat-devel", "configurePreset": "arch-static-compat-devel"},
-    {"name": "arch-android", "configurePreset": "arch-android"},
    {"name": "win-x64-msvc-static", "configurePreset": "win-x64-msvc-static"},
    {"name": "win-x64-msvc-static-devel", "configurePreset": "win-x64-msvc-static-devel"},
    {"name": "win-x64-msvc-static-debug", "configurePreset": "win-x64-msvc-static-debug"}
--- a/README.md
+++ b/README.md
@ -125,7 +125,7 @@ building on Windows.
  `BUILTIN_ICON_THEMES=breeze;breeze-dark`.
    * This variable must be set when building the application (not when building any of the libraries).
    * The specified icon themes need to be installed in the usual location. Otherwise, use e.g.
-      `BUILTIN_ICON_THEMES_SEARCH_PATH=D:/programming/misc/breeze-icons/usr/share/icons` to specify the
+      `DBUILTIN_ICON_THEMES_SEARCH_PATH=D:/programming/misc/breeze-icons/usr/share/icons` to specify the
      search path.
 * For more detailed documentation, see the documentation about build variables (in
  [directory doc](https://github.com/Martchus/cpp-utilities/blob/master/doc/buildvariables.md) and
--- a/application/argumentparser.cpp
+++ b/application/argumentparser.cpp
@ -1799,7 +1799,7 @@ void ValueConversion::Helper::ArgumentValueConversionError::throwFailure(const s
    throw ParseError(argumentPath.empty()
            ? argsToString("Conversion of top-level value \"", valueToConvert, "\" to type \"", targetTypeName, "\" failed: ", errorMessage)
            : argsToString("Conversion of value \"", valueToConvert, "\" (for argument --", argumentPath.back()->name(), ") to type \"",
-                  targetTypeName, "\" failed: ", errorMessage));
+                targetTypeName, "\" failed: ", errorMessage));
 }

 /*!
@ -1810,7 +1810,7 @@ void ArgumentOccurrence::throwNumberOfValuesNotSufficient(unsigned long valuesTo
    throw ParseError(path.empty()
            ? argsToString("Expected ", valuesToConvert, " top-level values to be present but only ", values.size(), " have been specified.")
            : argsToString("Expected ", valuesToConvert, " values for argument --", path.back()->name(), " to be present but only ", values.size(),
-                  " have been specified."));
+                " have been specified."));
 }

 } // namespace CppUtilities
--- a/application/argumentparser.h
+++ b/application/argumentparser.h
@ -881,7 +881,7 @@ inline void Argument::setFlags(Argument::Flags flags, bool add)
 {
    m_flags = add ? (m_flags | flags)
                  : static_cast<Argument::Flags>(static_cast<std::underlying_type<Argument::Flags>::type>(m_flags)
-                        & ~static_cast<std::underlying_type<Argument::Flags>::type>(flags));
+                      & ~static_cast<std::underlying_type<Argument::Flags>::type>(flags));
 }

 /*!
--- a/application/fakeqtconfigarguments.cpp
+++ b/application/fakeqtconfigarguments.cpp
@ -14,7 +14,7 @@ namespace CppUtilities {
 */
 FakeQtConfigArguments::FakeQtConfigArguments()
    : m_qtWidgetsGuiArg(
-          "qt-widgets-gui", 'g', "shows a Qt widgets based graphical user interface (the application has not been built with Qt widgets support)")
+        "qt-widgets-gui", 'g', "shows a Qt widgets based graphical user interface (the application has not been built with Qt widgets support)")
    , m_qtQuickGuiArg(
          "qt-quick-gui", 'q', "shows a Qt quick based graphical user interface (the application has not been built with Qt quick support)")
 {
--- a/cmake/modules/AppUtilities.cmake
+++ b/cmake/modules/AppUtilities.cmake
@ -63,7 +63,7 @@ function (add_appstream_file)
    endif ()

    # create appstream desktop file from template
-    set(APPSTREAM_FILE "${CMAKE_CURRENT_BINARY_DIR}/resources/${META_ID}.metainfo.xml")
+    set(APPSTREAM_FILE "${CMAKE_CURRENT_BINARY_DIR}/resources/${META_ID}.appdata.xml")
    configure_file("${APP_APPSTREAM_TEMPLATE_FILE}" "${APPSTREAM_FILE}" @ONLY)

    # add install for the appstream file
--- a/cmake/modules/BasicConfig.cmake
+++ b/cmake/modules/BasicConfig.cmake
@ -191,39 +191,18 @@ if (NOT META_PROJECT_LICENSE)
    endif ()
 endif ()

-# determine RDNS automatically from other meta-data and allow override
-set(${META_PROJECT_VARNAME_UPPER}_RDNS_OVERRIDE
-    ""
-    CACHE STRING "overrides the RDNS used in AppStream meta-data files for ${META_PROJECT_NAME}")
-if (${META_PROJECT_VARNAME_UPPER}_RDNS_OVERRIDE)
-    set(META_PROJECT_RDNS ${${META_PROJECT_VARNAME_UPPER}_RDNS_OVERRIDE})
-endif ()
-set(${META_PROJECT_VARNAME_UPPER}_DEVELOPER_ID_OVERRIDE
-    ""
-    CACHE STRING "overrides the developer ID used in AppStream meta-data files for ${META_PROJECT_NAME}")
-if (${META_PROJECT_VARNAME_UPPER}_DEVELOPER_ID_OVERRIDE)
-    set(META_DEVELOPER_ID ${${META_PROJECT_VARNAME_UPPER}_DEVELOPER_ID_OVERRIDE})
-endif ()
-if (${META_PROJECT_VARNAME_UPPER}_RDNS_OVERRIDE OR ${META_PROJECT_VARNAME_UPPER}_DEVELOPER_ID_OVERRIDE)
-    message(
-        WARNING
-            "Overriding the RDNS or developer ID is NOT recommended. This feature is only intended to ease "
-            "transitioning when a change is required and to create alternative packaging for development and private use.")
-endif ()
-if (NOT META_PROJECT_RDNS OR NOT META_DEVELOPER_ID)
-    string(TOLOWER "${META_APP_AUTHOR}" META_APP_AUTHOR_LOWER)
+# determine RDNS automatically from other meta-data
+if (NOT META_PROJECT_RDNS)
    if (NOT META_PROJECT_RDNS_BASE)
-        if (META_APP_URL MATCHES ".*github\\.(com|io).*")
+        if (META_APP_URL MATCHES ".*github\\.com.*")
            set(META_PROJECT_RDNS_BASE "io.github") # assume GitHub pages
        else ()
            set(META_PROJECT_RDNS_BASE "org")
        endif ()
    endif ()
+    string(TOLOWER "${META_APP_AUTHOR}" META_APP_AUTHOR_LOWER)
    set(META_PROJECT_RDNS "${META_PROJECT_RDNS_BASE}.${META_APP_AUTHOR_LOWER}.${META_PROJECT_NAME}${TARGET_SUFFIX}")
 endif ()
-if (NOT META_DEVELOPER_ID)
-    set(META_DEVELOPER_ID "${META_PROJECT_RDNS_BASE}.${META_APP_AUTHOR_LOWER}")
-endif ()

 # provide variables for other projects built as part of the same subdirs project to access files from this project
 get_directory_property(HAS_PARENT PARENT_DIRECTORY)
--- a/cmake/modules/DevelUtilities.cmake
+++ b/cmake/modules/DevelUtilities.cmake
@ -59,7 +59,7 @@ function (configure_development_warnings)
    option(TREAT_WARNINGS_AS_ERRORS "adds additional compiler flag to treat warnings as errors" "${ENABLE_DEVEL_DEFAULTS}")
    if (TREAT_WARNINGS_AS_ERRORS)
        if (CMAKE_CXX_COMPILER_ID MATCHES ".*Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-            list(APPEND COMPILE_OPTIONS_TO_CONFIGURE -Werror -Wno-error=address)
+            list(APPEND COMPILE_OPTIONS_TO_CONFIGURE -Werror)
        else ()
            message(AUTHOR_WARNING "Treating warnings as errors is not supported for compiler '${CMAKE_CXX_COMPILER_ID}'.")
        endif ()
--- a/cmake/modules/LibraryTarget.cmake
+++ b/cmake/modules/LibraryTarget.cmake
@ -51,6 +51,12 @@ if (NOT BUILD_SHARED_LIBS)
 endif ()

 # add global library-specific header
+set(TARGET_GENERATED_INCLUDE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/include")
+set(TARGET_GLOBAL_HEADER "${TARGET_GENERATED_INCLUDE_DIRECTORY}/global.h")
+if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/global.h")
+    # cleanup "global.h" from the source directory (which is where previous versions of c++utilities wrote this file)
+    file(REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/global.h")
+endif ()
 find_template_file("global.h" CPP_UTILITIES GLOBAL_H_TEMPLATE_FILE)
 if ("${META_PROJECT_NAME}" STREQUAL "c++utilities")
    set(GENERAL_GLOBAL_H_INCLUDE_PATH "\"application/global.h\"")
@ -58,10 +64,8 @@ else ()
    set(GENERAL_GLOBAL_H_INCLUDE_PATH "<c++utilities/application/global.h>")
 endif ()
 configure_file(
-    "${GLOBAL_H_TEMPLATE_FILE}" "${CMAKE_CURRENT_SOURCE_DIR}/global.h" # simply add this to source to ease inclusion
-    NEWLINE_STYLE UNIX # since this goes to sources ensure consistency
+    "${GLOBAL_H_TEMPLATE_FILE}" "${TARGET_GLOBAL_HEADER}" NEWLINE_STYLE UNIX # since this goes to sources ensure consistency
 )
-list(APPEND HEADER_FILES global.h)

 # add header to check library version
 set(VERSION_HEADER_FILE "${CMAKE_CURRENT_BINARY_DIR}/resources/version.h")
@ -138,8 +142,7 @@ if (USE_HEADER_FOR_PUBLIC_COMPILE_DEFINITIONS)
        endif ()
    endforeach ()
 endif ()
-set(TARGET_GENERATED_INCLUDE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/include")
-set(TARGET_DEFINITIONS_HEADER "${TARGET_GENERATED_INCLUDE_DIRECTORY}/${META_PROJECT_NAME}-definitions.h")
+set(TARGET_DEFINITIONS_HEADER "${TARGET_GENERATED_INCLUDE_DIRECTORY}/${META_TARGET_NAME}-definitions.h")
 file(WRITE "${TARGET_DEFINITIONS_HEADER}" "${DEFS_FOR_HEADER}")

 # add library to be created, set libs to link against, set version and C++ standard
@ -580,14 +583,12 @@ if (NOT META_NO_INSTALL_TARGETS AND ENABLE_INSTALL_TARGETS)
                DESTINATION "${INCLUDE_SUBDIR}/${META_PROJECT_NAME}/${HEADER_DIR}"
                COMPONENT header)
        endforeach ()
-        install(
-            FILES "${VERSION_HEADER_FILE}"
-            DESTINATION "${INCLUDE_SUBDIR}/${META_PROJECT_NAME}"
-            COMPONENT header)
-        install(
-            FILES "${TARGET_DEFINITIONS_HEADER}"
-            DESTINATION "${INCLUDE_SUBDIR}/${META_PROJECT_NAME}"
-            COMPONENT header)
+        foreach (GENERATED_HEADER ${TARGET_GLOBAL_HEADER} ${VERSION_HEADER_FILE} ${TARGET_DEFINITIONS_HEADER})
+            install(
+                FILES "${GENERATED_HEADER}"
+                DESTINATION "${INCLUDE_SUBDIR}/${META_PROJECT_NAME}"
+                COMPONENT header)
+        endforeach ()
        if (NOT TARGET install-header)
            add_custom_target(install-header COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=header -P
                                                     "${CMAKE_BINARY_DIR}/cmake_install.cmake")
--- a/cmake/modules/TestUtilities.cmake
+++ b/cmake/modules/TestUtilities.cmake
@ -52,10 +52,9 @@ function (configure_test_target)
        PRIVATE "${ARGS_LIBRARIES}" "${PRIVATE_LIBRARIES}")
    target_include_directories(
        "${TEST_TARGET_NAME}"
-        PUBLIC $<BUILD_INTERFACE:${TARGET_INCLUDE_DIRECTORY_BUILD_INTERFACE}>
-               $<BUILD_INTERFACE:${TARGET_GENERATED_INCLUDE_DIRECTORY}> $<INSTALL_INTERFACE:${HEADER_INSTALL_DESTINATION}>
+        PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<INSTALL_INTERFACE:${HEADER_INSTALL_DESTINATION}>
               ${PUBLIC_INCLUDE_DIRS}
-        PRIVATE ${TEST_INCLUDE_DIRS} ${PRIVATE_INCLUDE_DIRS})
+        PRIVATE ${TEST_INCLUDE_DIRS} "${PRIVATE_INCLUDE_DIRS}")
    target_compile_definitions(
        "${TEST_TARGET_NAME}"
        PUBLIC "${META_PUBLIC_COMPILE_DEFINITIONS}"
--- a/cmake/templates/appdata.xml.in
+++ b/cmake/templates/appdata.xml.in
@ -9,7 +9,7 @@
  <url type="homepage">@META_APP_URL@</url>
  <url type="bugtracker">@META_APP_BUGTRACKER_URL@</url>
  <launchable type="desktop-id">@META_ID@.desktop</launchable>
-  <developer id="@META_DEVELOPER_ID@"><name>@META_APP_AUTHOR@</name></developer>
+  <developer><name>@META_APP_AUTHOR@</name></developer>
  <provides>
    <binary>@META_TARGET_NAME@</binary>
  </provides>
--- a/cmake/templates/config.h.in
+++ b/cmake/templates/config.h.in
@ -13,7 +13,6 @@
 #define PROJECT_CONFIG_SUFFIX "@META_CONFIG_SUFFIX@"
 #define PROJECT_CONFIG_TARGET_SUFFIX "@TARGET_SUFFIX@"
 #define APP_NAME "@META_APP_NAME@"
-#define APP_ID "@META_ID@"
 #define APP_VERSION "@META_APP_VERSION@"
 #define APP_VERSION_MAJOR @META_VERSION_MAJOR@
 #define APP_VERSION_MINOR @META_VERSION_MINOR@
--- a/cmake/templates/global.h.in
+++ b/cmake/templates/global.h.in
@ -1,28 +1,12 @@
 // Created via CMake from template global.h.in
 // WARNING! Any changes to this file will be overwritten by the next CMake run!

+// This file is only provided for compatibility.
+// Include "@META_TARGET_NAME@-global.h" directly new code.
+
 #ifndef @META_PROJECT_VARNAME_UPPER@_GLOBAL
 #define @META_PROJECT_VARNAME_UPPER@_GLOBAL

-#include "@META_PROJECT_NAME@-definitions.h"
-#include @GENERAL_GLOBAL_H_INCLUDE_PATH@
-
-#ifdef @META_PROJECT_VARNAME_UPPER@_STATIC
-#define @META_PROJECT_VARNAME_UPPER@_EXPORT
-#define @META_PROJECT_VARNAME_UPPER@_IMPORT
-#else
-#define @META_PROJECT_VARNAME_UPPER@_EXPORT CPP_UTILITIES_GENERIC_LIB_EXPORT
-#define @META_PROJECT_VARNAME_UPPER@_IMPORT CPP_UTILITIES_GENERIC_LIB_IMPORT
-#endif
-
-/*!
- * \def @META_PROJECT_VARNAME_UPPER@_EXPORT
- * \brief Marks the symbol to be exported by the @META_PROJECT_NAME@ library.
- */
-
-/*!
- * \def @META_PROJECT_VARNAME_UPPER@_IMPORT
- * \brief Marks the symbol to be imported from the @META_PROJECT_NAME@ library.
- */
+#include "@META_TARGET_NAME@-global.h"

 #endif // @META_PROJECT_VARNAME_UPPER@_GLOBAL
--- a/conversion/stringbuilder.h
+++ b/conversion/stringbuilder.h
@ -16,16 +16,16 @@ template <class StringType, class ViewType> using IsStringViewType = std::is_sam
 template <class StringType, class CharType> using IsCharType = std::is_same<typename StringType::value_type, CharType>;
 namespace Detail {
 template <typename StringType, typename T>
-auto IsStringType(
-    int) -> decltype(std::declval<StringType &>().append(std::declval<const T &>()), std::declval<const T &>().size(), Traits::Bool<true>{});
+auto IsStringType(int)
+    -> decltype(std::declval<StringType &>().append(std::declval<const T &>()), std::declval<const T &>().size(), Traits::Bool<true>{});
 template <typename StringType, typename T> Traits::Bool<false> IsStringType(...);
 template <typename StringType> void functionTakingConstStringRef(const StringType &str);
 template <typename StringType, typename T>
 auto IsConvertibleToConstStringRef(int) -> decltype(functionTakingConstStringRef<StringType>(std::declval<const T &>()), Traits::Bool<true>{});
 template <typename StringType, typename T> Traits::Bool<false> IsConvertibleToConstStringRef(...);
 template <typename StringType, typename T>
-auto IsConvertibleToConstStringRefViaNative(
-    int) -> decltype(functionTakingConstStringRef<StringType>(std::declval<const T &>().native()), Traits::Bool<true>{});
+auto IsConvertibleToConstStringRefViaNative(int)
+    -> decltype(functionTakingConstStringRef<StringType>(std::declval<const T &>().native()), Traits::Bool<true>{});
 template <typename StringType, typename T> Traits::Bool<false> IsConvertibleToConstStringRefViaNative(...);
 } // namespace Detail
 template <typename StringType, typename StringType2>
--- a/conversion/stringconversion.h
+++ b/conversion/stringconversion.h
@ -421,16 +421,13 @@ template <typename IntegralType, class StringType = std::string, typename BaseTy
    CppUtilities::Traits::EnableIf<std::is_integral<IntegralType>, std::is_unsigned<IntegralType>> * = nullptr>
 StringType numberToString(IntegralType number, BaseType base = 10)
 {
-    auto resSize = std::size_t();
-    auto n = number;
+    std::size_t resSize = 0;
+    for (auto n = number; n; n /= static_cast<IntegralType>(base), ++resSize)
+        ;
+    StringType res;
+    res.reserve(resSize);
    do {
-        n /= static_cast<IntegralType>(base), ++resSize;
-    } while (n);
-    auto res = StringType(resSize, typename StringType::value_type());
-    auto resIter = res.end();
-    do {
-        *(--resIter)
-            = digitToChar<typename StringType::value_type>(static_cast<typename StringType::value_type>(number % static_cast<IntegralType>(base)));
+        res.insert(res.begin(), digitToChar<typename StringType::value_type>(static_cast<typename StringType::value_type>(number % base)));
        number /= static_cast<IntegralType>(base);
    } while (number);
    return res;
@ -446,24 +443,24 @@ template <typename IntegralType, class StringType = std::string, typename BaseTy
    Traits::EnableIf<std::is_integral<IntegralType>, std::is_signed<IntegralType>> * = nullptr>
 StringType numberToString(IntegralType number, BaseType base = 10)
 {
-    const auto negative = number < 0;
-    auto resSize = std::size_t();
+    const bool negative = number < 0;
+    std::size_t resSize;
    if (negative) {
        number = -number, resSize = 1;
+    } else {
+        resSize = 0;
    }
-    auto n = number;
+    for (auto n = number; n; n /= static_cast<IntegralType>(base), ++resSize)
+        ;
+    StringType res;
+    res.reserve(resSize);
    do {
-        n /= static_cast<IntegralType>(base), ++resSize;
-    } while (n);
-    auto res = StringType(resSize, typename StringType::value_type());
-    auto resIter = res.end();
-    do {
-        *(--resIter)
-            = digitToChar<typename StringType::value_type>(static_cast<typename StringType::value_type>(number % static_cast<IntegralType>(base)));
+        res.insert(res.begin(),
+            digitToChar<typename StringType::value_type>(static_cast<typename StringType::value_type>(number % static_cast<IntegralType>(base))));
        number /= static_cast<IntegralType>(base);
    } while (number);
    if (negative) {
-        *(--resIter) = '-';
+        res.insert(res.begin(), '-');
    }
    return res;
 }
@ -490,7 +487,7 @@ StringType numberToString(FloatingType number, int base = 10)
 */
 template <typename CharType> CharType charToDigit(CharType character, CharType base)
 {
-    auto res = base;
+    CharType res = base;
    if (character >= '0' && character <= '9') {
        res = character - '0';
    } else if (character >= 'a' && character <= 'z') {
@ -501,13 +498,11 @@ template <typename CharType> CharType charToDigit(CharType character, CharType b
    if (res < base) {
        return res;
    }
-    constexpr auto msgBegin = std::string_view("The character \"");
-    constexpr auto msgEnd = std::string_view("\" is no valid digit.");
-    auto errorMsg = std::string();
-    errorMsg.reserve(msgBegin.size() + msgEnd.size() + 2);
-    errorMsg += msgBegin;
+    std::string errorMsg;
+    errorMsg.reserve(36);
+    errorMsg += "The character \"";
    errorMsg += character >= ' ' && character <= '~' ? static_cast<std::string::value_type>(character) : '?';
-    errorMsg += msgEnd;
+    errorMsg += "\" is no valid digit.";
    throw ConversionException(std::move(errorMsg));
 }

--- a/global.h
+++ b/global.h
@ -1,28 +0,0 @@
-// Created via CMake from template global.h.in
-// WARNING! Any changes to this file will be overwritten by the next CMake run!
-
-#ifndef CPP_UTILITIES_GLOBAL
-#define CPP_UTILITIES_GLOBAL
-
-#include "c++utilities-definitions.h"
-#include "application/global.h"
-
-#ifdef CPP_UTILITIES_STATIC
-#define CPP_UTILITIES_EXPORT
-#define CPP_UTILITIES_IMPORT
-#else
-#define CPP_UTILITIES_EXPORT CPP_UTILITIES_GENERIC_LIB_EXPORT
-#define CPP_UTILITIES_IMPORT CPP_UTILITIES_GENERIC_LIB_IMPORT
-#endif
-
-/*!
- * \def CPP_UTILITIES_EXPORT
- * \brief Marks the symbol to be exported by the c++utilities library.
- */
-
-/*!
- * \def CPP_UTILITIES_IMPORT
- * \brief Marks the symbol to be imported from the c++utilities library.
- */
-
-#endif // CPP_UTILITIES_GLOBAL
--- a/tests/argumentparsertests.cpp
+++ b/tests/argumentparsertests.cpp
@ -190,7 +190,7 @@ void ArgumentParserTests::testParsing()
    CPPUNIT_ASSERT_EQUAL("album"sv, std::string_view(fieldsArg.values().at(0)));
    CPPUNIT_ASSERT_EQUAL("title"sv, std::string_view(fieldsArg.values().at(1)));
    CPPUNIT_ASSERT_EQUAL("diskpos"sv, std::string_view(fieldsArg.values().at(2)));
-    CPPUNIT_ASSERT_EQUAL(3_st, fieldsArg.values().size());
+    CPPUNIT_ASSERT_THROW(displayTagInfoArg.values().at(3), std::out_of_range);
    CPPUNIT_ASSERT_EQUAL(&displayTagInfoArg, parser.specifiedOperation());

    // skip empty args
@ -208,7 +208,7 @@ void ArgumentParserTests::testParsing()
    CPPUNIT_ASSERT_EQUAL("title"sv, std::string_view(fieldsArg.values().at(1)));
    CPPUNIT_ASSERT_EQUAL("diskpos"sv, std::string_view(fieldsArg.values().at(2)));
    CPPUNIT_ASSERT_EQUAL(""sv, std::string_view(fieldsArg.values().at(3)));
-    CPPUNIT_ASSERT_EQUAL(4_st, fieldsArg.values().size());
+    CPPUNIT_ASSERT_THROW(fieldsArg.values().at(4), std::out_of_range);
    CPPUNIT_ASSERT(filesArg.isPresent());
    CPPUNIT_ASSERT_EQUAL("somefile"sv, std::string_view(filesArg.values().at(0)));

@ -267,7 +267,7 @@ void ArgumentParserTests::testParsing()
    CPPUNIT_ASSERT(!filesArg.isPresent());
    CPPUNIT_ASSERT(fileArg.isPresent());
    CPPUNIT_ASSERT_EQUAL("test"sv, std::string_view(fileArg.values().at(0)));
-    CPPUNIT_ASSERT_EQUAL(1_st, fileArg.values().size());
+    CPPUNIT_ASSERT_THROW(fileArg.values().at(1), std::out_of_range);

    // constraint checking: no multiple occurrences (not resetting verboseArg on purpose)
    displayFileInfoArg.reset();
@ -405,7 +405,7 @@ void ArgumentParserTests::testParsing()
    CPPUNIT_ASSERT_EQUAL("album=test"sv, std::string_view(fieldsArg.values().at(0)));
    CPPUNIT_ASSERT_EQUAL("title"sv, std::string_view(fieldsArg.values().at(1)));
    CPPUNIT_ASSERT_EQUAL("diskpos"sv, std::string_view(fieldsArg.values().at(2)));
-    CPPUNIT_ASSERT_EQUAL(3_st, fieldsArg.values().size());
+    CPPUNIT_ASSERT_THROW(fieldsArg.values().at(3), out_of_range);
    CPPUNIT_ASSERT(filesArg.isPresent());
    CPPUNIT_ASSERT_EQUAL("somefile"sv, std::string_view(filesArg.values().at(0)));
    CPPUNIT_ASSERT(!notAlbumArg.isPresent());
@ -473,7 +473,7 @@ void ArgumentParserTests::testParsing()
    CPPUNIT_ASSERT_EQUAL("foo"sv, std::string_view(fieldsArg.values().at(0)));
    CPPUNIT_ASSERT_EQUAL("bar"sv, std::string_view(fieldsArg.values().at(1)));
    CPPUNIT_ASSERT_EQUAL("--help"sv, std::string_view(fieldsArg.values().at(2)));
-    CPPUNIT_ASSERT_EQUAL(3_st, fieldsArg.values().size());
+    CPPUNIT_ASSERT_THROW(fieldsArg.values().at(3), std::out_of_range);
 }

 /*!