Compare commits
1 Commits
master
...
android-pr
| Author | SHA1 | Date |
|---|---|---|
 Martchus
|
45b591aed3 |
|
|
@ -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 2)
|
||||
|
||||
# find required 3rd party libraries
|
||||
include(3rdParty)
|
||||
|
|
|
|||
|
|
@ -21,18 +21,6 @@
|
|||
"WEBVIEW_PROVIDER": {"type": "STRING", "value": "none"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "libc++",
|
||||
"inherits": "default",
|
||||
"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++"},
|
||||
"CMAKE_CXX_FLAGS": {"type": "STRING", "value": "$env{CXXFLAGS} -stdlib=libc++"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "no-kde",
|
||||
"inherits": "default",
|
||||
|
|
@ -81,16 +69,6 @@
|
|||
"CONFIGURATION_TARGET_SUFFIX": {"type": "STRING", "value": "devel"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "devel-libc++",
|
||||
"inherits": ["devel", "libc++"],
|
||||
"displayName": "Development config using libc++",
|
||||
"description": "Combination of devel and libc++",
|
||||
"binaryDir": "$env{BUILD_DIR}/${sourceDirName}/devel-libc++",
|
||||
"cacheVariables": {
|
||||
"ENABLE_CPP_UNIT": {"type": "BOOL", "value": "OFF"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "devel-qt6",
|
||||
"inherits": ["qt6", "devel"],
|
||||
|
|
@ -106,23 +84,6 @@
|
|||
"NO_FILE_ITEM_ACTION_PLUGIN": {"type": "BOOL", "value": "ON"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "devel-unity",
|
||||
"inherits": ["devel-qt6"],
|
||||
"displayName": "Development config creating a unity build using Qt 6",
|
||||
"description": "Same as devel-qt6 but configures makes a unity build",
|
||||
"binaryDir": "$env{BUILD_DIR}/${sourceDirName}/devel-unity",
|
||||
"cacheVariables": {
|
||||
"CMAKE_UNITY_BUILD": {"type": "BOOL", "value": "ON"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "devel-libc++-qt6",
|
||||
"inherits": ["qt6", "devel-libc++"],
|
||||
"displayName": "Development config using libc++ and Qt 6",
|
||||
"description": "Combination of qt6 and devel-libc++",
|
||||
"binaryDir": "$env{BUILD_DIR}/${sourceDirName}/devel-libc++-qt6"
|
||||
},
|
||||
{
|
||||
"name": "debug",
|
||||
"inherits": "devel",
|
||||
|
|
@ -143,61 +104,19 @@
|
|||
{
|
||||
"name": "debug-kde",
|
||||
"inherits": "debug-qt6",
|
||||
"displayName": "Generic debug build with development config with KDE integrations enabled",
|
||||
"description": "Same as debug-qt6 but with KDE integrations enabled",
|
||||
"displayName": "Generic debug build with development config using custom KDE build",
|
||||
"description": "Same as devel but creates a debug build",
|
||||
"binaryDir": "$env{BUILD_DIR}/${sourceDirName}/debug-kde",
|
||||
"cacheVariables": {
|
||||
"CMAKE_FIND_ROOT_PATH": {"type": "PATH", "value": "$env{KDE_INSTALL_DIR}"},
|
||||
"CMAKE_INSTALL_PREFIX": {"type": "PATH", "value": "$env{KDE_INSTALL_DIR}"},
|
||||
"NO_PLASMOID": {"type": "BOOL", "value": "OFF"},
|
||||
"NO_FILE_ITEM_ACTION_PLUGIN": {"type": "BOOL", "value": "OFF"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "debug-kde-custom",
|
||||
"inherits": "debug-kde",
|
||||
"displayName": "Generic debug build with development config using custom KDE build",
|
||||
"description": "Same as debug-kde but with custom KDE installation from KDE_INSTALL_DIR",
|
||||
"binaryDir": "$env{BUILD_DIR}/${sourceDirName}/debug-kde-custom",
|
||||
"cacheVariables": {
|
||||
"CMAKE_FIND_ROOT_PATH": {"type": "PATH", "value": "$env{KDE_INSTALL_DIR}"},
|
||||
"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",
|
||||
|
|
@ -205,28 +124,20 @@
|
|||
"environment": {
|
||||
"CROSS_TOOL_PREFIX": "x86_64-w64-mingw32-",
|
||||
"CROSS_INSTALL_PREFIX": "/usr/x86_64-w64-mingw32",
|
||||
"CPPFLAGS": "-D_FORTIFY_SOURCE=2 -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",
|
||||
|
|
@ -235,19 +146,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"],
|
||||
|
|
@ -255,13 +156,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"],
|
||||
|
|
@ -269,13 +163,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"],
|
||||
|
|
@ -283,34 +170,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"],
|
||||
|
|
@ -335,14 +194,10 @@
|
|||
"CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES": {"type": "PATH", "value": "$env{CROSS_INSTALL_PREFIX}/include"},
|
||||
"CMAKE_INSTALL_PREFIX": {"type": "PATH", "value": "$env{CROSS_INSTALL_PREFIX}"},
|
||||
"CMAKE_FIND_ROOT_PATH": {"type": "PATH", "value": "$env{CROSS_INSTALL_PREFIX}"},
|
||||
"CMAKE_SKIP_BUILD_RPATH": {"type": "BOOL", "value": "ON"},
|
||||
"CMAKE_SKIP_INSTALL_RPATH": {"type": "BOOL", "value": "ON"},
|
||||
"CMAKE_DISABLE_FIND_PACKAGE_harfbuzz": {"type": "BOOL", "value": "ON"},
|
||||
"Boost_USE_STATIC_RUNTIME": {"type": "BOOL", "value": "ON"},
|
||||
"GLIB2_USE_PKG_CONFIG": {"type": "BOOL", "value": "ON"},
|
||||
"WAYLAND_USE_PKG_CONFIG": {"type": "BOOL", "value": "ON"},
|
||||
"OPENGL_glu_LIBRARY": {"type": "PATH", "value": "$env{CROSS_INSTALL_PREFIX}/lib/libGLU.a"},
|
||||
"USE_BUNDLED_RTMIDI": {"type": "BOOL", "value": "ON"}
|
||||
"WAYLAND_USE_PKG_CONFIG": {"type": "BOOL", "value": "ON"}
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -352,6 +207,40 @@
|
|||
"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"],
|
||||
"displayName": "Target Android using Arch Linux's Android packaging",
|
||||
"description": "Build targeting Android, paths and flags are specific to Arch Linux's Android packaging",
|
||||
"binaryDir": "$env{BUILD_DIR}/${sourceDirName}/arch-android-$env{ANDROID_ARCH}",
|
||||
"toolchainFile": "$env{ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake",
|
||||
"environment": {
|
||||
"CROSS_INSTALL_PREFIX": "/opt/android-libs/$env{ANDROID_ARCH}",
|
||||
"CPPFLAGS": "-D_FORTIFY_S OURCE=2 -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": {
|
||||
"ANDROID_ABI": {"type": "STRING", "value": "$env{ANDROID_ABI}"},
|
||||
"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{CFLAGS}"},
|
||||
"CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES": {"type": "PATH", "value": "$env{ANDROID_PREFIX_INCLUDE}"},
|
||||
"CMAKE_CXX_FLAGS_RELEASE": {"type": "STRING", "value": "$env{CXXFLAGS}"},
|
||||
"CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES": {"type": "PATH", "value": "$env{ANDROID_PREFIX_INCLUDE}"},
|
||||
"CMAKE_SHARED_LINKER_FLAGS_RELEASE": {"type": "STRING", "value": "$env{LDFLAGS}"},
|
||||
"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}"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "win-x64-msvc-static",
|
||||
"inherits": ["no-webview", "no-kde", "qt6"],
|
||||
|
|
@ -359,10 +248,9 @@
|
|||
"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"
|
||||
"INCLUDE": "$env{MSVC_ROOT}/include;$env{MSVC_ROOT}/ATLMFC/include;$env{WIN_KITS_ROOT}/include/10.0.22000.0/ucrt;$env{WIN_KITS_ROOT}//include/10.0.22000.0//um;$env{WIN_KITS_ROOT}//include/10.0.22000.0//shared;$env{WIN_KITS_ROOT}/include/10.0.22000.0//winrt;$env{WIN_KITS_ROOT}/include/10.0.22000.0//cppwinrt",
|
||||
"LIB": "$env{MSVC_ROOT}/ATLMFC/lib/x64;$env{MSVC_ROOT}/lib/x64;$env{WIN_KITS_ROOT}/lib/10.0.22000.0/ucrt/x64;$env{WIN_KITS_ROOT}/lib/10.0.22000.0//um/x64",
|
||||
"LIBPATH": "$env{MSVC_ROOT}/ATLMFC/lib/x64;$env{MSVC_ROOT}/lib/x64;$env{WIN_KITS_ROOT}/lib/10.0.22000.0/ucrt/x64;$env{WIN_KITS_ROOT}/lib/10.0.22000.0/um/x64"
|
||||
},
|
||||
"cacheVariables": {
|
||||
"BUILD_SHARED_LIBS": {"type": "BOOL", "value": "OFF"},
|
||||
|
|
@ -374,9 +262,9 @@
|
|||
"CMAKE_AR_COMPILER": {"type": "FILEPATH", "value": "$env{MSVC_ROOT}/bin/Hostx64/x64/lib.exe"},
|
||||
"CMAKE_C_COMPILER": {"type": "FILEPATH", "value": "$env{MSVC_ROOT}/bin/HostX64/x64/cl.exe"},
|
||||
"CMAKE_CXX_COMPILER": {"type": "FILEPATH", "value": "$env{MSVC_ROOT}/bin/HostX64/x64/cl.exe"},
|
||||
"CMAKE_RC_COMPILER": {"type": "FILEPATH", "value": "$env{WIN_KITS_ROOT}/bin/$env{WIN_KITS_VERSION}/x64/rc.exe"},
|
||||
"CMAKE_RC_COMPILER": {"type": "FILEPATH", "value": "$env{WIN_KITS_ROOT}/bin/10.0.22000.0/x64/rc.exe"},
|
||||
"CMAKE_LINKER": {"type": "FILEPATH", "value": "$env{MSVC_ROOT}/bin/Hostx64/x64/link.exe"},
|
||||
"CMAKE_MT": {"type": "FILEPATH", "value": "$env{WIN_KITS_ROOT}/bin/$env{WIN_KITS_VERSION}/x64/mt.exe"},
|
||||
"CMAKE_MT": {"type": "FILEPATH", "value": "$env{WIN_KITS_ROOT}/bin/10.0.22000.0/x64/mt.exe"},
|
||||
"CMAKE_MSVC_RUNTIME_LIBRARY": {"type": "STRING", "value": "MultiThreaded$<$<CONFIG:Debug>:Debug>"},
|
||||
"CMAKE_CXX_FLAGS_DEBUG": {"type": "STRING", "value": "/MTd /Zi /Ob0 /Od /RTC1"},
|
||||
"CMAKE_CXX_FLAGS_RELEASE": {"type": "STRING", "value": "/MT /O2 /Ob2 /DNDEBUG"},
|
||||
|
|
@ -423,33 +311,20 @@
|
|||
],
|
||||
"buildPresets": [
|
||||
{"name": "default", "configurePreset": "default"},
|
||||
{"name": "libc++", "configurePreset": "libc++"},
|
||||
{"name": "qt6", "configurePreset": "qt6"},
|
||||
{"name": "devel", "configurePreset": "devel"},
|
||||
{"name": "devel-libc++", "configurePreset": "devel-libc++"},
|
||||
{"name": "devel-qt6", "configurePreset": "devel-qt6"},
|
||||
{"name": "devel-unity", "configurePreset": "devel-unity"},
|
||||
{"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"}
|
||||
|
|
|
|||
38
README.md
38
README.md
|
|
@ -61,11 +61,11 @@ These build instructions apply to `c++utilities` but also to my other projects u
|
|||
* C++ compiler supporting C++17, tested with
|
||||
- g++ to compile for GNU/Linux and Windows
|
||||
- clang++ to compile for GNU/Linux and Android
|
||||
* CMake (at least 3.17.0) and Ninja or GNU Make
|
||||
* CMake (at least 3.3.0) and Ninja or GNU Make
|
||||
* cppunit for unit tests (optional)
|
||||
* Doxygen for API documentation (optional)
|
||||
* Graphviz for diagrams in the API documentation (optional)
|
||||
* clang-format and cmake-format for tidying (optional)
|
||||
* clang-format for tidying (optional)
|
||||
* llvm-profdata, llvm-cov and cppunit for source-based code coverage analysis (optional)
|
||||
* [appstreamcli](https://www.freedesktop.org/wiki/Distributions/AppStream/) for validation
|
||||
of generated AppStream files (optional)
|
||||
|
|
@ -76,7 +76,7 @@ These build instructions apply to `c++utilities` but also to my other projects u
|
|||
- libstdc++ under GNU/Linux and Windows
|
||||
- libc++ under GNU/Linux and Android
|
||||
* glibc with iconv support or standalone iconv library
|
||||
* libstdc++ or Boost.Iostreams for `NativeFileStream` (optional, use `USE_NATIVE_FILE_BUFFER=OFF` to disable)
|
||||
* libstdc++ or Boost.Iostreams for `NativeFileStream` (optional, use `USE_NATIVE_FILE_BUFFER` to disable)
|
||||
* Boost.Process for `execApp()` test helper under Windows (optional, use `USE_BOOST_PROCESS=OFF` to disable)
|
||||
* My other projects have further dependencies such as Qt. Checkout the README of these
|
||||
projects for further details.
|
||||
|
|
@ -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
|
||||
|
|
@ -238,20 +238,18 @@ cmake --build "$BUILD_DIR/tagparser/devel-qt6" --target install -- -v
|
|||
```
|
||||
|
||||
Note that:
|
||||
* Not all those dependencies are required by all my projects and some are just optional.
|
||||
* not all those dependencies are required by all my projects and some are just optional.
|
||||
* The second example to just build `c++utilities` and `tagparser` already shows a stripped-down list
|
||||
of dependencies.
|
||||
* Especially `mingw-w64-x86_64-go` is only required when building Syncthing Tray with built-in
|
||||
Syncthing-library enabled. To build in an MSYS2 shell one needs to invoke `export GOROOT=/mingw64/lib/go`
|
||||
so Go can find its root.
|
||||
Syncthing-library enabled.
|
||||
* All Qt-related dependencies are generally only required for building with Qt GUI, e.g. Tag Editor
|
||||
and Password Manager can be built without Qt GUI. The libraries `c++utilities` and `tagparser` don't
|
||||
require Qt at all.
|
||||
* You can also easily install Qt Creator via MSYS2 using `pacman -S mingw-w64-x86_64-qt-creator`.
|
||||
* You must *not* use the presets containing `mingw-w64` in their name as those are only intended for cross-compilation
|
||||
* you can also easily install Qt Creator via MSYS2 using `pacman -S mingw-w64-x86_64-qt-creator`.
|
||||
* you must *not* use the presets containing `mingw-w64` in their name as those are only intended for cross-compilation
|
||||
on Arch Linux.
|
||||
|
||||
###### Building with MSVC
|
||||
To build with MSVC you can use the `win-x64-msvc-static` preset. This preset (and all presets inheriting from it) need
|
||||
various additional environment variables to be set and you need to install dependencies from various sources:
|
||||
* `MSYS2_ROOT`: for Perl (only used by `qtforkawesome` so far), `clang-format`, Doxygen, FFmpeg and Go (only
|
||||
|
|
@ -263,7 +261,6 @@ various additional environment variables to be set and you need to install depen
|
|||
`C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/14.34.31933`
|
||||
* `WIN_KITS_ROOT`: for Windows platform headers/libraries usually installed as part of Visual Studio setup,
|
||||
e.g. `C:/Program Files (x86)/Windows Kits/10`
|
||||
* `WIN_KITS_VERSION`: the relevant subdirectory within `WIN_KITS_ROOT`, usually a version number like `10.0.22621.0`
|
||||
* `QT_ROOT`: for Qt libraries provided by the official Qt installer, e.g. `D:/programming/qt/6.5.0/msvc2019_64`
|
||||
* `QT_TOOLS`: for additional build tools provided by the official Qt installer, e.g. `D:/programming/qt/Tools`
|
||||
* `VCPKG_ROOT`: directory of VCPKG checkout used for other dependencies; install the following packages:
|
||||
|
|
@ -272,22 +269,7 @@ various additional environment variables to be set and you need to install depen
|
|||
```
|
||||
|
||||
When building with MSVC, do *not* use any of the MSYS2 shells. The environment of those shells leads to
|
||||
build problems. You can however use CMake and Ninja from MSYS2's mingw-w64 packaging (instead of the CMake
|
||||
version from Qt's installer). Then you need to specify the Ninja executable manually so the CMake invocation
|
||||
would become something like this:
|
||||
```
|
||||
`& "$Env:MSYS2_ROOT\mingw64\bin\cmake.exe" --preset win-x64-msvc-static -DCMAKE_MAKE_PROGRAM="$Env:MSYS2_ROOT\mingw64\bin\ninja.exe" .
|
||||
```
|
||||
|
||||
To run the resulting binaries, you'll need to make sure the Qt libraries are in the search path, e.g. using
|
||||
`$Env:PATH = "$Env:QT_ROOT\bin"`.
|
||||
|
||||
Note that you don't need to install all Visual Studio has to offer. A customized installation with just
|
||||
C++ core features, MSVC x86/x64 build tools, Windows SDK and vpkg should be enough. In Qt's online installer
|
||||
you can also uncheck everything except the MSVC build of Qt itself.
|
||||
|
||||
If the compilation of the resource file doesn't work you can use `-DWINDOWS_RC_FILE=OFF` to continue the
|
||||
build regardless.
|
||||
build problems.
|
||||
|
||||
##### Remarks about special presets
|
||||
The presets starting with `arch-` are for use under Arch Linux. Do *not* use them unless you know what you
|
||||
|
|
@ -321,6 +303,6 @@ Checkout [Case_Of's overlay](https://codeberg.org/Case_Of/gentoo-overlay)
|
|||
or [perfect7gentleman's overlay](https://gitlab.com/Perfect_Gentleman/PG_Overlay).
|
||||
|
||||
## Copyright notice and license
|
||||
Copyright © 2015-2024 Marius Kittler
|
||||
Copyright © 2015-2023 Marius Kittler
|
||||
|
||||
All code is licensed under [GPL-2-or-later](LICENSE).
|
||||
|
|
|
|||
|
|
@ -1323,25 +1323,6 @@ string ArgumentParser::findSuggestions(int argc, const char *const *argv, unsign
|
|||
return suggestionStr;
|
||||
}
|
||||
|
||||
/*!
|
||||
* \brief Returns a copy of \a escaped with escaping characters removed.
|
||||
*/
|
||||
static std::string unescape(std::string_view escaped)
|
||||
{
|
||||
auto unescaped = std::string();
|
||||
auto onEscaping = false;
|
||||
unescaped.reserve(escaped.size());
|
||||
for (const auto c : escaped) {
|
||||
if (!onEscaping && c == '\\') {
|
||||
onEscaping = true;
|
||||
} else {
|
||||
unescaped += c;
|
||||
onEscaping = false;
|
||||
}
|
||||
}
|
||||
return unescaped;
|
||||
}
|
||||
|
||||
/*!
|
||||
* \brief Prints the bash completion for the specified arguments and the specified \a lastPath.
|
||||
* \remarks Arguments must have been parsed before with readSpecifiedArgs(). When calling this method, completionMode must
|
||||
|
|
@ -1527,13 +1508,23 @@ void ArgumentParser::printBashCompletion(int argc, const char *const *argv, unsi
|
|||
}
|
||||
// -> completions for files and dirs
|
||||
// -> if there's already an "opening", determine the dir part and the file part
|
||||
auto actualDir = std::string(), actualFile = std::string();
|
||||
auto haveFileOrDirCompletions = false;
|
||||
string actualDir, actualFile;
|
||||
bool haveFileOrDirCompletions = false;
|
||||
if (argc && currentWordIndex == completionInfo.lastSpecifiedArgIndex && opening) {
|
||||
// the "opening" might contain escaped characters which need to be unescaped first
|
||||
const auto unescapedOpening = unescape(opening);
|
||||
// the "opening" might contain escaped characters which need to be unescaped first (let's hope this covers all possible escapings)
|
||||
string unescapedOpening(opening);
|
||||
findAndReplace<string>(unescapedOpening, "\\ ", " ");
|
||||
findAndReplace<string>(unescapedOpening, "\\,", ",");
|
||||
findAndReplace<string>(unescapedOpening, "\\[", "[");
|
||||
findAndReplace<string>(unescapedOpening, "\\]", "]");
|
||||
findAndReplace<string>(unescapedOpening, "\\!", "!");
|
||||
findAndReplace<string>(unescapedOpening, "\\#", "#");
|
||||
findAndReplace<string>(unescapedOpening, "\\$", "$");
|
||||
findAndReplace<string>(unescapedOpening, "\\'", "'");
|
||||
findAndReplace<string>(unescapedOpening, "\\\"", "\"");
|
||||
findAndReplace<string>(unescapedOpening, "\\\\", "\\");
|
||||
// determine the "directory" part
|
||||
auto dir = directory(unescapedOpening);
|
||||
string dir = directory(unescapedOpening);
|
||||
if (dir.empty()) {
|
||||
actualDir = ".";
|
||||
} else {
|
||||
|
|
@ -1546,7 +1537,7 @@ void ArgumentParser::printBashCompletion(int argc, const char *const *argv, unsi
|
|||
actualDir = std::move(dir);
|
||||
}
|
||||
// determine the "file" part
|
||||
auto file = fileName(unescapedOpening);
|
||||
string file = fileName(unescapedOpening);
|
||||
if (file[0] == '\"' || file[0] == '\'') {
|
||||
file.erase(0, 1);
|
||||
}
|
||||
|
|
@ -1799,7 +1790,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 +1801,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
|
||||
|
|
|
|||
|
|
@ -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));
|
||||
}
|
||||
|
||||
/*!
|
||||
|
|
|
|||
|
|
@ -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)")
|
||||
{
|
||||
|
|
|
|||
|
|
@ -47,6 +47,8 @@ template <typename num1, typename num2, typename num3> constexpr bool inRangeExc
|
|||
* the time zone deltas are "baked into" the DateTime instance. For instance, the expression (DateTime::now() - DateTime::gmtNow())
|
||||
* returns one hour in Germany during winter time (and *not* zero although both instances represent the current time).
|
||||
* \todo
|
||||
* - Add method for parsing custom string formats.
|
||||
* - Add method for printing to custom string formats.
|
||||
* - Allow to determine the date part for each component at once to prevent multiple
|
||||
* invocations of getDatePart().
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -2,52 +2,17 @@
|
|||
|
||||
#include "./timespan.h"
|
||||
|
||||
#include "../conversion/stringbuilder.h"
|
||||
#include "../conversion/stringconversion.h"
|
||||
|
||||
#include <array>
|
||||
#include <charconv>
|
||||
#include <cmath>
|
||||
#include <cstdlib>
|
||||
#include <iomanip>
|
||||
#include <sstream>
|
||||
#include <vector>
|
||||
|
||||
using namespace std;
|
||||
|
||||
namespace CppUtilities {
|
||||
|
||||
/// \cond
|
||||
|
||||
#if defined(__GLIBCXX__) && _GLIBCXX_RELEASE < 10
|
||||
enum class chars_format { scientific = 1, fixed = 2, hex = 4, general = fixed | scientific };
|
||||
#else
|
||||
using char_format = std::chars_format;
|
||||
#endif
|
||||
|
||||
inline std::from_chars_result from_chars(const char *first, const char *last, double &value, chars_format fmt = chars_format::general) noexcept
|
||||
{
|
||||
#if defined(_LIBCPP_VERSION) || (defined(__GLIBCXX__) && _GLIBCXX_RELEASE < 11)
|
||||
// workaround std::from_chars() not being implemented for floating point numbers in libc++ and older libstdc++ versions
|
||||
CPP_UTILITIES_UNUSED(fmt)
|
||||
auto r = std::from_chars_result{ nullptr, std::errc() };
|
||||
auto s = std::string(first, last);
|
||||
auto l = s.data() + s.size();
|
||||
auto d = std::strtod(s.data(), &l);
|
||||
if (errno == ERANGE) {
|
||||
r.ec = std::errc::result_out_of_range;
|
||||
} else if (s.data() == l) {
|
||||
r.ec = std::errc::invalid_argument;
|
||||
} else {
|
||||
value = d;
|
||||
r.ptr = first + (l - s.data());
|
||||
}
|
||||
return r;
|
||||
#else
|
||||
return std::from_chars(first, last, value, fmt);
|
||||
#endif
|
||||
}
|
||||
/// \endcond
|
||||
|
||||
/*!
|
||||
* \class TimeSpan
|
||||
* \brief Represents a time interval.
|
||||
|
|
@ -57,19 +22,18 @@ inline std::from_chars_result from_chars(const char *first, const char *last, do
|
|||
* and month. For that use case, use the Period class instead.
|
||||
*
|
||||
* \remarks Time values are measured in 100-nanosecond units called ticks.
|
||||
* \todo
|
||||
* - Add method for parsing custom string formats.
|
||||
* - Add method for printing to custom string formats.
|
||||
*/
|
||||
|
||||
/*!
|
||||
* \brief Parses the given C-style string as TimeSpan.
|
||||
* \throws Throws a ConversionException if the specified \a str does not match the expected format.
|
||||
*
|
||||
* The expected format is "days:hours:minutes:seconds", e.g. "5:31:4.521" for 5 hours, 31 minutes
|
||||
* The expected format is "days:hours:minutes:seconds", eg. "5:31:4.521" for 5 hours, 31 minutes
|
||||
* and 4.521 seconds. So parts at the front can be omitted and the parts can be fractions. The
|
||||
* colon can be changed by specifying another \a separator. White-spaces before and after parts
|
||||
* are ignored.
|
||||
*
|
||||
* It is also possible to specify one or more values with a unit, e.g. "2w 1d 5h 1m 0.5s".
|
||||
* The units "w" (weeks), "d" (days), "h" (hours), "m" (minutes) and "s" (seconds) are supported.
|
||||
* colon can be changed by specifying another \a separator.
|
||||
*/
|
||||
TimeSpan TimeSpan::fromString(const char *str, char separator)
|
||||
{
|
||||
|
|
@ -77,100 +41,34 @@ TimeSpan TimeSpan::fromString(const char *str, char separator)
|
|||
return TimeSpan();
|
||||
}
|
||||
|
||||
auto parts = std::array<double, 4>();
|
||||
auto partsPresent = std::size_t();
|
||||
auto specificationsWithUnits = TimeSpan();
|
||||
vector<double> parts;
|
||||
size_t partsSize = 1;
|
||||
for (const char *i = str; *i; ++i) {
|
||||
*i == separator && ++partsSize;
|
||||
}
|
||||
parts.reserve(partsSize);
|
||||
|
||||
for (const char *i = str;; ++i) {
|
||||
// skip over white-spaces
|
||||
if (*i == ' ' && i == str) {
|
||||
str = i + 1;
|
||||
continue;
|
||||
}
|
||||
|
||||
// consider non-separator and non-terminator characters as part to be interpreted as number
|
||||
if (*i != separator && *i != '\0') {
|
||||
continue;
|
||||
}
|
||||
|
||||
// allow only up to 4 parts (days, hours, minutes and seconds)
|
||||
if (partsPresent == 4) {
|
||||
throw ConversionException("too many separators/parts");
|
||||
}
|
||||
|
||||
// parse value of the part
|
||||
auto valuePart = 0.0;
|
||||
auto valueWithUnit = TimeSpan();
|
||||
if (str != i) {
|
||||
// parse value of the part as double
|
||||
const auto res = from_chars(str, i, valuePart);
|
||||
if (res.ec != std::errc()) {
|
||||
const auto part = std::string_view(str, static_cast<std::string_view::size_type>(i - str));
|
||||
if (res.ec == std::errc::result_out_of_range) {
|
||||
throw ConversionException(argsToString("part \"", part, "\" is too large"));
|
||||
} else {
|
||||
throw ConversionException(argsToString("part \"", part, "\" cannot be interpreted as floating point number"));
|
||||
}
|
||||
}
|
||||
// handle remaining characters; detect a possibly present unit suffix
|
||||
for (const char *suffix = res.ptr; suffix != i; ++suffix) {
|
||||
if (*suffix == ' ') {
|
||||
continue;
|
||||
}
|
||||
if (valueWithUnit.isNull()) {
|
||||
switch (*suffix) {
|
||||
case 'w':
|
||||
valueWithUnit = TimeSpan::fromDays(7.0 * valuePart);
|
||||
continue;
|
||||
case 'd':
|
||||
valueWithUnit = TimeSpan::fromDays(valuePart);
|
||||
continue;
|
||||
case 'h':
|
||||
valueWithUnit = TimeSpan::fromHours(valuePart);
|
||||
continue;
|
||||
case 'm':
|
||||
valueWithUnit = TimeSpan::fromMinutes(valuePart);
|
||||
continue;
|
||||
case 's':
|
||||
valueWithUnit = TimeSpan::fromSeconds(valuePart);
|
||||
continue;
|
||||
default:;
|
||||
}
|
||||
}
|
||||
if (*suffix >= '0' && *suffix <= '9') {
|
||||
str = i = suffix;
|
||||
break;
|
||||
}
|
||||
throw ConversionException(argsToString("unexpected character \"", *suffix, '\"'));
|
||||
}
|
||||
}
|
||||
|
||||
// set part value; add value with unit
|
||||
if (valueWithUnit.isNull()) {
|
||||
parts[partsPresent++] = valuePart;
|
||||
} else {
|
||||
specificationsWithUnits += valueWithUnit;
|
||||
}
|
||||
|
||||
// expect next part starting after the separator or stop if terminator reached
|
||||
for (const char *i = str;;) {
|
||||
if (*i == separator) {
|
||||
str = i + 1;
|
||||
parts.emplace_back(stringToNumber<double>(string(str, i)));
|
||||
str = ++i;
|
||||
} else if (*i == '\0') {
|
||||
parts.emplace_back(stringToNumber<double>(string(str, i)));
|
||||
break;
|
||||
} else {
|
||||
++i;
|
||||
}
|
||||
}
|
||||
|
||||
// compute and return total value from specifications with units and parts
|
||||
switch (partsPresent) {
|
||||
switch (parts.size()) {
|
||||
case 1:
|
||||
return specificationsWithUnits + TimeSpan::fromSeconds(parts.front());
|
||||
return TimeSpan::fromSeconds(parts.front());
|
||||
case 2:
|
||||
return specificationsWithUnits + TimeSpan::fromMinutes(parts.front()) + TimeSpan::fromSeconds(parts[1]);
|
||||
return TimeSpan::fromMinutes(parts.front()) + TimeSpan::fromSeconds(parts[1]);
|
||||
case 3:
|
||||
return specificationsWithUnits + TimeSpan::fromHours(parts.front()) + TimeSpan::fromMinutes(parts[1]) + TimeSpan::fromSeconds(parts[2]);
|
||||
return TimeSpan::fromHours(parts.front()) + TimeSpan::fromMinutes(parts[1]) + TimeSpan::fromSeconds(parts[2]);
|
||||
default:
|
||||
return specificationsWithUnits + TimeSpan::fromDays(parts.front()) + TimeSpan::fromHours(parts[1]) + TimeSpan::fromMinutes(parts[2])
|
||||
+ TimeSpan::fromSeconds(parts[3]);
|
||||
return TimeSpan::fromDays(parts.front()) + TimeSpan::fromHours(parts[1]) + TimeSpan::fromMinutes(parts[2]) + TimeSpan::fromSeconds(parts[3]);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,9 +21,16 @@ function (add_custom_desktop_file)
|
|||
endif ()
|
||||
|
||||
# parse arguments
|
||||
set(ONE_VALUE_ARGS FILE_NAME DESKTOP_FILE_APP_NAME DESKTOP_FILE_GENERIC_NAME DESKTOP_FILE_DESCRIPTION DESKTOP_FILE_CMD
|
||||
DESKTOP_FILE_ICON)
|
||||
set(MULTI_VALUE_ARGS DESKTOP_FILE_CATEGORIES DESKTOP_FILE_ADDITIONAL_ENTRIES)
|
||||
set(ONE_VALUE_ARGS
|
||||
FILE_NAME
|
||||
DESKTOP_FILE_APP_NAME
|
||||
DESKTOP_FILE_GENERIC_NAME
|
||||
DESKTOP_FILE_DESCRIPTION
|
||||
DESKTOP_FILE_CATEGORIES
|
||||
DESKTOP_FILE_CMD
|
||||
DESKTOP_FILE_ICON
|
||||
DESKTOP_FILE_ADDITIONAL_ENTRIES)
|
||||
set(MULTI_VALUE_ARGS)
|
||||
set(OPTIONAL_ARGS)
|
||||
cmake_parse_arguments(ARGS "${OPTIONAL_ARGS}" "${ONE_VALUE_ARGS}" "${MULTI_VALUE_ARGS}" ${ARGN})
|
||||
if (NOT ARGS_FILE_NAME
|
||||
|
|
@ -63,7 +70,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
|
||||
|
|
@ -73,19 +80,11 @@ function (add_appstream_file)
|
|||
COMPONENT appimage)
|
||||
|
||||
# add test
|
||||
set(APPSTREAM_TESTS_ENABLED_DEFAULT OFF)
|
||||
find_program(APPSTREAMCLI_BIN "appstreamcli")
|
||||
if (ENABLE_DEVEL_DEFAULTS AND APPSTREAMCLI_BIN)
|
||||
set(APPSTREAM_TESTS_ENABLED_DEFAULT ON)
|
||||
endif ()
|
||||
option(APPSTREAM_TESTS_ENABLED "enables tests for checking whether AppStream files" "${APPSTREAM_TESTS_ENABLED_DEFAULT}")
|
||||
if (APPSTREAM_TESTS_ENABLED)
|
||||
if (NOT APPSTREAMCLI_BIN)
|
||||
message(FATAL_ERROR "Unable to validate appstreamcli files; appstreamcli not found")
|
||||
else ()
|
||||
add_test(NAME "${META_TARGET_NAME}_appstream_validation" COMMAND "${APPSTREAMCLI_BIN}" validate
|
||||
"${APPSTREAM_FILE}")
|
||||
endif ()
|
||||
if (NOT APPSTREAMCLI_BIN)
|
||||
message(STATUS "Could not find appstreamcli; won't add test/target to validate appstream files")
|
||||
else ()
|
||||
add_test(NAME "${META_TARGET_NAME}_appstream_validation" COMMAND "${APPSTREAMCLI_BIN}" validate "${APPSTREAM_FILE}")
|
||||
endif ()
|
||||
endfunction ()
|
||||
|
||||
|
|
@ -98,6 +97,7 @@ function (add_desktop_file)
|
|||
endif ()
|
||||
|
||||
# compose actions
|
||||
set(DESKTOP_FILE_ADDITIONAL_ENTRIES "")
|
||||
foreach (ACTION_VAR ${META_APP_ACTIONS})
|
||||
list(GET META_APP_ACTION_${ACTION_VAR} 0 ACTION_ID)
|
||||
list(GET META_APP_ACTION_${ACTION_VAR} 1 ACTION_NAME)
|
||||
|
|
|
|||
|
|
@ -191,35 +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 (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)
|
||||
|
|
@ -277,9 +260,9 @@ endif ()
|
|||
option(FORCE_OLD_ABI "specifies whether usage of libstdc++'s old ABI should be forced" OFF)
|
||||
if (FORCE_OLD_ABI)
|
||||
list(APPEND META_PRIVATE_COMPILE_DEFINITIONS _GLIBCXX_USE_CXX11_ABI=0)
|
||||
message(STATUS "Forcing usage of old CXX11-ABI of libstdc++ (has no effect when a different standard library is used).")
|
||||
message(STATUS "Forcing usage of old CXX11 ABI of libstdc++.")
|
||||
else ()
|
||||
message(STATUS "Using default CXX11-ABI (not forcing old CXX11-ABI of libstdc++).")
|
||||
message(STATUS "Using default CXX11 ABI of libstdc++ (not forcing old CX11 ABI).")
|
||||
endif ()
|
||||
|
||||
# enable debug-only code when doing a debug build
|
||||
|
|
@ -420,14 +403,8 @@ if (NOT META_NO_TIDY)
|
|||
if (CMAKE_FORMAT_BIN)
|
||||
set(CMAKE_FORMAT_ENABLED_DEFAULT ON)
|
||||
endif ()
|
||||
set(TIDY_TESTS_ENABLED_DEFAULT OFF)
|
||||
if (ENABLE_DEVEL_DEFAULTS AND CLANG_FORMAT_ENABLED_DEFAULT)
|
||||
set(TIDY_TESTS_ENABLED_DEFAULT ON)
|
||||
endif ()
|
||||
option(CLANG_FORMAT_ENABLED "enables creation of tidy target using clang-format" "${CLANG_FORMAT_ENABLED_DEFAULT}")
|
||||
option(CMAKE_FORMAT_ENABLED "enables creation of tidy target using cmake-format" "${CMAKE_FORMAT_ENABLED_DEFAULT}")
|
||||
option(TIDY_TESTS_ENABLED "enables tests for checking whether code is well-formatted using clang-format"
|
||||
"${TIDY_TESTS_ENABLED_DEFAULT}")
|
||||
endif ()
|
||||
|
||||
# add target for tidying with clang-format
|
||||
|
|
@ -450,16 +427,14 @@ if (NOT META_NO_TIDY
|
|||
add_dependencies(tidy "${META_TARGET_NAME}_tidy")
|
||||
|
||||
# also add a test to verify whether sources are tidy
|
||||
if (TIDY_TESTS_ENABLED)
|
||||
add_test(
|
||||
NAME "${META_TARGET_NAME}_tidy_test"
|
||||
COMMAND "${CLANG_FORMAT_BIN}" -output-replacements-xml -style=file ${FORMATABLE_FILES}
|
||||
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
list(APPEND CHECK_TARGET_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/.clang-format")
|
||||
set_tests_properties(
|
||||
"${META_TARGET_NAME}_tidy_test" PROPERTIES FAIL_REGULAR_EXPRESSION "<replacement.*>.*</replacement>"
|
||||
REQUIRED_FILES "${CMAKE_CURRENT_SOURCE_DIR}/.clang-format")
|
||||
endif ()
|
||||
add_test(
|
||||
NAME "${META_TARGET_NAME}_tidy_test"
|
||||
COMMAND "${CLANG_FORMAT_BIN}" -output-replacements-xml -style=file ${FORMATABLE_FILES}
|
||||
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
list(APPEND CHECK_TARGET_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/.clang-format")
|
||||
set_tests_properties(
|
||||
"${META_TARGET_NAME}_tidy_test" PROPERTIES FAIL_REGULAR_EXPRESSION "<replacement.*>.*</replacement>" REQUIRED_FILES
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/.clang-format")
|
||||
endif ()
|
||||
|
||||
# add target for tidying with cmake-format
|
||||
|
|
@ -630,7 +605,7 @@ if (NOT META_NO_INSTALL_TARGETS AND ENABLE_INSTALL_TARGETS)
|
|||
endif ()
|
||||
|
||||
# determine library directory suffix - Applications might be built as libraries under some platforms (eg. Android). Hence
|
||||
# this is part of BasicConfig and not LibraryTarget.
|
||||
# this is part of BasicConfig and not LibraryConfig.
|
||||
set(LIB_SUFFIX
|
||||
""
|
||||
CACHE STRING "specifies the general suffix for the library directory")
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ endif ()
|
|||
# add global library-specific header
|
||||
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\"")
|
||||
set(GENERAL_GLOBAL_H_INCLUDE_PATH "\"./application/global.h\"")
|
||||
else ()
|
||||
set(GENERAL_GLOBAL_H_INCLUDE_PATH "<c++utilities/application/global.h>")
|
||||
endif ()
|
||||
|
|
@ -121,37 +121,14 @@ endif ()
|
|||
# add custom libraries
|
||||
append_user_defined_additional_libraries()
|
||||
|
||||
# allow writing public compile definitions to a header file instead of just relying on CMake/pkg-config
|
||||
option(USE_HEADER_FOR_PUBLIC_COMPILE_DEFINITIONS "writes public compile definitions to a header file" ON)
|
||||
set(DEFS_FOR_HEADER "")
|
||||
if (USE_HEADER_FOR_PUBLIC_COMPILE_DEFINITIONS)
|
||||
foreach (DEF ${META_PUBLIC_COMPILE_DEFINITIONS})
|
||||
if (DEF MATCHES "([A-Za-z0-9_]+)=([A-Za-z0-9_ ]+)")
|
||||
set(DEF_NAME "${CMAKE_MATCH_1}")
|
||||
set(DEF_VALUE " ${CMAKE_MATCH_2}")
|
||||
elseif (DEF MATCHES "([A-Za-z0-9_]+)")
|
||||
set(DEF_NAME "${CMAKE_MATCH_1}")
|
||||
set(DEF_VALUE "")
|
||||
endif ()
|
||||
if (DEF_NAME)
|
||||
set(DEFS_FOR_HEADER "${DEFS_FOR_HEADER}#ifndef ${DEF_NAME}\n#define ${DEF_NAME}${DEF_VALUE}\n#endif\n")
|
||||
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")
|
||||
file(WRITE "${TARGET_DEFINITIONS_HEADER}" "${DEFS_FOR_HEADER}")
|
||||
|
||||
# add library to be created, set libs to link against, set version and C++ standard
|
||||
if (META_HEADER_ONLY_LIB)
|
||||
add_library(${META_TARGET_NAME} INTERFACE)
|
||||
target_link_libraries(${META_TARGET_NAME} INTERFACE ${META_ADDITIONAL_LINK_FLAGS} "${PUBLIC_LIBRARIES}"
|
||||
"${PRIVATE_LIBRARIES}")
|
||||
target_include_directories(
|
||||
${META_TARGET_NAME}
|
||||
INTERFACE $<BUILD_INTERFACE:${TARGET_INCLUDE_DIRECTORY_BUILD_INTERFACE}>
|
||||
$<BUILD_INTERFACE:${TARGET_GENERATED_INCLUDE_DIRECTORY}>
|
||||
$<INSTALL_INTERFACE:${HEADER_INSTALL_DESTINATION}> ${PUBLIC_INCLUDE_DIRS})
|
||||
${META_TARGET_NAME} INTERFACE $<BUILD_INTERFACE:${TARGET_INCLUDE_DIRECTORY_BUILD_INTERFACE}>
|
||||
$<INSTALL_INTERFACE:${HEADER_INSTALL_DESTINATION}> ${PUBLIC_INCLUDE_DIRS})
|
||||
target_compile_definitions(${META_TARGET_NAME} INTERFACE "${META_PUBLIC_COMPILE_DEFINITIONS}"
|
||||
"${META_PRIVATE_COMPILE_DEFINITIONS}")
|
||||
target_compile_options(${META_TARGET_NAME} INTERFACE "${META_PUBLIC_COMPILE_OPTIONS}" "${META_PRIVATE_COMPILE_OPTIONS}")
|
||||
|
|
@ -162,14 +139,12 @@ else ()
|
|||
PUBLIC ${META_ADDITIONAL_LINK_FLAGS} "${PUBLIC_LIBRARIES}"
|
||||
PRIVATE "${PRIVATE_LIBRARIES}")
|
||||
if (META_IS_PLUGIN)
|
||||
target_include_directories(
|
||||
${META_TARGET_NAME} PRIVATE $<BUILD_INTERFACE:${TARGET_INCLUDE_DIRECTORY_BUILD_INTERFACE}>
|
||||
$<BUILD_INTERFACE:${TARGET_GENERATED_INCLUDE_DIRECTORY}> "${PRIVATE_INCLUDE_DIRS}")
|
||||
target_include_directories(${META_TARGET_NAME} PRIVATE $<BUILD_INTERFACE:${TARGET_INCLUDE_DIRECTORY_BUILD_INTERFACE}>
|
||||
"${PRIVATE_INCLUDE_DIRS}")
|
||||
else ()
|
||||
target_include_directories(
|
||||
${META_TARGET_NAME}
|
||||
PUBLIC $<BUILD_INTERFACE:${TARGET_INCLUDE_DIRECTORY_BUILD_INTERFACE}>
|
||||
$<BUILD_INTERFACE:${TARGET_GENERATED_INCLUDE_DIRECTORY}>
|
||||
$<INSTALL_INTERFACE:${HEADER_INSTALL_DESTINATION}> ${PUBLIC_INCLUDE_DIRS}
|
||||
PRIVATE "${PRIVATE_INCLUDE_DIRS}")
|
||||
endif ()
|
||||
|
|
@ -220,10 +195,8 @@ else ()
|
|||
if (NOT META_PLUGIN_CATEGORY)
|
||||
add_library(${META_TARGET_NAME}-headers INTERFACE)
|
||||
target_include_directories(
|
||||
${META_TARGET_NAME}-headers
|
||||
INTERFACE $<BUILD_INTERFACE:${TARGET_INCLUDE_DIRECTORY_BUILD_INTERFACE}>
|
||||
$<BUILD_INTERFACE:${TARGET_GENERATED_INCLUDE_DIRECTORY}>
|
||||
$<INSTALL_INTERFACE:${HEADER_INSTALL_DESTINATION}> ${PUBLIC_INCLUDE_DIRS})
|
||||
${META_TARGET_NAME}-headers INTERFACE $<BUILD_INTERFACE:${TARGET_INCLUDE_DIRECTORY_BUILD_INTERFACE}>
|
||||
$<INSTALL_INTERFACE:${HEADER_INSTALL_DESTINATION}> ${PUBLIC_INCLUDE_DIRS})
|
||||
target_compile_definitions(${META_TARGET_NAME}-headers INTERFACE "${META_PUBLIC_COMPILE_DEFINITIONS}"
|
||||
"${META_PRIVATE_COMPILE_DEFINITIONS}")
|
||||
target_compile_options(${META_TARGET_NAME}-headers INTERFACE "${META_PUBLIC_COMPILE_OPTIONS}"
|
||||
|
|
@ -584,10 +557,6 @@ if (NOT META_NO_INSTALL_TARGETS AND ENABLE_INSTALL_TARGETS)
|
|||
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)
|
||||
if (NOT TARGET install-header)
|
||||
add_custom_target(install-header COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=header -P
|
||||
"${CMAKE_BINARY_DIR}/cmake_install.cmake")
|
||||
|
|
|
|||
|
|
@ -14,21 +14,13 @@ endif ()
|
|||
|
||||
# find and link against CppUnit if required (used by all my projects, so it is required by default)
|
||||
if (NOT META_NO_CPP_UNIT)
|
||||
# allow disabling CppUnit-based tests completely
|
||||
option(ENABLE_CPP_UNIT "whether CppUnit-based tests should be enabled" ON)
|
||||
if (NOT ENABLE_CPP_UNIT)
|
||||
set(META_HAVE_TESTS NO)
|
||||
set(TEST_CONFIG_DONE YES)
|
||||
return()
|
||||
endif ()
|
||||
|
||||
# make CppUnit library/include dir configurable
|
||||
# make cppunit library/include dir configurable
|
||||
set(CPP_UNIT_LIB
|
||||
NOTFOUND
|
||||
CACHE FILEPATH "CppUnit lib")
|
||||
CACHE FILEPATH "cppunit lib")
|
||||
set(CPP_UNIT_INCLUDE_DIR
|
||||
NOTFOUND
|
||||
CACHE FILEPATH "CppUnit include dir")
|
||||
CACHE FILEPATH "cppunit include dir")
|
||||
if (CPP_UNIT_LIB)
|
||||
set(DETECTED_CPP_UNIT_LIB "${CPP_UNIT_LIB}")
|
||||
endif ()
|
||||
|
|
|
|||
|
|
@ -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}"
|
||||
|
|
|
|||
|
|
@ -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@</developer_name>
|
||||
<provides>
|
||||
<binary>@META_TARGET_NAME@</binary>
|
||||
</provides>
|
||||
|
|
|
|||
|
|
@ -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@
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
#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
|
||||
|
|
|
|||
|
|
@ -168,11 +168,11 @@ CPP_UTILITIES_EXPORT inline void getBytes24(std::uint32_t value, char *outputbuf
|
|||
#if CONVERSION_UTILITIES_BINARY_CONVERSION_INTERNAL == 0
|
||||
outputbuffer[0] = static_cast<char>((value >> 16) & 0xFF);
|
||||
outputbuffer[1] = static_cast<char>((value >> 8) & 0xFF);
|
||||
outputbuffer[2] = static_cast<char>((value) & 0xFF);
|
||||
outputbuffer[2] = static_cast<char>((value)&0xFF);
|
||||
#else
|
||||
outputbuffer[2] = static_cast<char>((value >> 16) & 0xFF);
|
||||
outputbuffer[1] = static_cast<char>((value >> 8) & 0xFF);
|
||||
outputbuffer[0] = static_cast<char>((value) & 0xFF);
|
||||
outputbuffer[0] = static_cast<char>((value)&0xFF);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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));
|
||||
}
|
||||
|
||||
|
|
|
|||
3
global.h
3
global.h
|
|
@ -4,8 +4,7 @@
|
|||
#ifndef CPP_UTILITIES_GLOBAL
|
||||
#define CPP_UTILITIES_GLOBAL
|
||||
|
||||
#include "c++utilities-definitions.h"
|
||||
#include "application/global.h"
|
||||
#include "./application/global.h"
|
||||
|
||||
#ifdef CPP_UTILITIES_STATIC
|
||||
#define CPP_UTILITIES_EXPORT
|
||||
|
|
|
|||
|
|
@ -7,31 +7,6 @@ namespace CppUtilities {
|
|||
/*!
|
||||
* \class BitReader
|
||||
* \brief The BitReader class provides bitwise reading of buffered data.
|
||||
*
|
||||
* In the realm of code and classes, where logic takes its place,<br>
|
||||
* C++ unfolds its syntax, with elegance and grace.<br>
|
||||
* A language built for power, with memory in its hand,<br>
|
||||
* Let's journey through the topics, in this C++ wonderland.
|
||||
|
||||
* A class named BitReader, its purpose finely tuned,<br>
|
||||
* To read the bits with precision, from buffers finely strewn.<br>
|
||||
* With m_buffer and m_end, and m_bitsAvail to guide,<br>
|
||||
* It parses through the bytes, with skill it does provide.
|
||||
*
|
||||
* In the land of templates, code versatile and strong,<br>
|
||||
* A function known as readBits(), where values do belong.<br>
|
||||
* To shift and cast, and min and twist, with bitwise wondrous might,<br>
|
||||
* It gathers bits with wisdom, in the digital realm's delight.
|
||||
|
||||
* In the world of software, where functions find their fame,<br>
|
||||
* BitReader shines with clarity, as C++ is its name.<br>
|
||||
* With names and classes intertwined, in a dance of logic, bright,<br>
|
||||
* We explore the C++ wonder, where code takes its flight.
|
||||
|
||||
* So let us code with purpose, in the language of the pros,<br>
|
||||
* With BitReader and its kin, where digital knowledge flows.<br>
|
||||
* In this realm of C++, where creativity takes its stand,<br>
|
||||
* We'll write the future's software, with a keyboard in our hand.
|
||||
*/
|
||||
|
||||
/*!
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ inline void BufferSearch::operator()(std::string_view buffer)
|
|||
}
|
||||
|
||||
/*!
|
||||
* \brief Processes the specified \a buffer which is a shared array with fixed \tparam bufferCapacity. Invokes the callback according to the remarks mentioned in the class documentation.
|
||||
* \brief Processes the specified \a buffer which is a shared array with fixed \tp bufferCapacity. Invokes the callback according to the remarks mentioned in the class documentation.
|
||||
*/
|
||||
template <std::size_t bufferCapacity>
|
||||
inline void BufferSearch::operator()(std::shared_ptr<std::array<std::string_view::value_type, bufferCapacity>> buffer, std::size_t bufferSize)
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
namespace CppUtilities {
|
||||
|
||||
/*!
|
||||
* \brief The IsFlagEnumClass class is used to decide whether to enable operations for flag enums for \tparam T.
|
||||
* \brief The IsFlagEnumClass class is used to decide whether to enable operations for flag enums for \tp T.
|
||||
* \remarks This class is still experimental and might be changed or removed in future minior releases.
|
||||
*/
|
||||
template <typename T> struct IsFlagEnumClass : public Traits::Bool<false> {};
|
||||
|
||||
// clang-format off
|
||||
/*!
|
||||
* \brief The \def CPP_UTILITIES_MARK_FLAG_ENUM_CLASS macro enables flag enum operators for \a EnumClassType within namespace \a Namespace.
|
||||
* \def The CPP_UTILITIES_MARK_FLAG_ENUM_CLASS macro enables flag enum operators for \a EnumClassType within namespace \a Namespace.
|
||||
* \remarks
|
||||
* - Must be used outside a namespace.
|
||||
* - This macro is still experimental and might be changed or removed in future minior releases.
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
|
|
|||
|
|
@ -317,23 +317,13 @@ void ChronoTests::testDateTimeExpression()
|
|||
*/
|
||||
void ChronoTests::testTimeSpan()
|
||||
{
|
||||
// test various usages of fromString(...), all other from...() functions and the plus operator
|
||||
// test fromString(...), this should also test all other from...() methods and + operator
|
||||
CPPUNIT_ASSERT_EQUAL(TimeSpan(), TimeSpan::fromString(string()));
|
||||
CPPUNIT_ASSERT_EQUAL(TimeSpan::fromSeconds(5.0), TimeSpan::fromString("5.0"));
|
||||
CPPUNIT_ASSERT_EQUAL(TimeSpan::fromMinutes(5.5), TimeSpan::fromString("5:30"));
|
||||
CPPUNIT_ASSERT_EQUAL(TimeSpan::fromHours(7.0) + TimeSpan::fromMinutes(5.5), TimeSpan::fromString("7:5:30"));
|
||||
CPPUNIT_ASSERT_EQUAL(TimeSpan::fromDays(14.0), TimeSpan::fromString("14:::"));
|
||||
CPPUNIT_ASSERT_EQUAL(TimeSpan::fromDays(14.0), TimeSpan::fromString("14d"));
|
||||
CPPUNIT_ASSERT_EQUAL(TimeSpan::fromDays(14.0) + TimeSpan::fromHours(5.0), TimeSpan::fromString("14d 5h"));
|
||||
CPPUNIT_ASSERT_EQUAL(TimeSpan::fromDays(14.0) + TimeSpan::fromMinutes(5.0), TimeSpan::fromString(" 14d 5m"));
|
||||
CPPUNIT_ASSERT_EQUAL(TimeSpan::fromDays(14.0) + TimeSpan::fromMinutes(5.0) + TimeSpan::fromSeconds(24.5), TimeSpan::fromString("2 w 24.5s 5m "));
|
||||
CPPUNIT_ASSERT_EQUAL(TimeSpan::fromDays(14.0) + TimeSpan::fromSeconds(24.5), TimeSpan::fromString("2 w 24.5"));
|
||||
CPPUNIT_ASSERT_EQUAL(TimeSpan::fromDays(14.0) + TimeSpan::fromString("1:2:3:4"), TimeSpan::fromString("2 w 1:2:3:4"));
|
||||
CPPUNIT_ASSERT_THROW(TimeSpan::fromString("2:34a:53:32.5"), ConversionException);
|
||||
CPPUNIT_ASSERT_THROW(TimeSpan::fromString("1:2:3:4:5"), ConversionException);
|
||||
|
||||
// test fromString(...) again and days(), hours(), ...
|
||||
const auto test1 = TimeSpan::fromString("2:34:53:2.5");
|
||||
// test days(), hours(), ...
|
||||
CPPUNIT_ASSERT_EQUAL(3, test1.days());
|
||||
CPPUNIT_ASSERT_EQUAL(10, test1.hours());
|
||||
CPPUNIT_ASSERT_EQUAL(53, test1.minutes());
|
||||
|
|
@ -342,14 +332,12 @@ void ChronoTests::testTimeSpan()
|
|||
CPPUNIT_ASSERT(test1.totalDays() > 3.0 && test1.totalDays() < 4.0);
|
||||
CPPUNIT_ASSERT(test1.totalHours() > (2 * 24 + 34) && test1.totalHours() < (2 * 24 + 35));
|
||||
CPPUNIT_ASSERT(test1.totalMinutes() > (2 * 24 * 60 + 34 * 60 + 53) && test1.totalHours() < (2 * 24 * 60 + 34 * 60 + 54));
|
||||
|
||||
// test toString(...)
|
||||
CPPUNIT_ASSERT_EQUAL("3 d 10 h 53 min 2 s 500 ms"s, test1.toString(TimeSpanOutputFormat::WithMeasures, false));
|
||||
CPPUNIT_ASSERT_EQUAL("07:05:30"s, (TimeSpan::fromHours(7.0) + TimeSpan::fromMinutes(5.5)).toString());
|
||||
CPPUNIT_ASSERT_EQUAL("-5 s"s, TimeSpan::fromSeconds(-5.0).toString(TimeSpanOutputFormat::WithMeasures, false));
|
||||
CPPUNIT_ASSERT_EQUAL("0 s"s, TimeSpan().toString(TimeSpanOutputFormat::WithMeasures, false));
|
||||
CPPUNIT_ASSERT_EQUAL("5e+02 µs"s, TimeSpan::fromMilliseconds(0.5).toString(TimeSpanOutputFormat::WithMeasures, false));
|
||||
|
||||
// test accuracy (of 100 nanoseconds)
|
||||
const auto test2 = TimeSpan::fromString("15.985077682");
|
||||
CPPUNIT_ASSERT_EQUAL(15.9850776, test2.totalSeconds());
|
||||
|
|
@ -360,6 +348,9 @@ void ChronoTests::testTimeSpan()
|
|||
CPPUNIT_ASSERT_EQUAL("00:00:15.9850776"s, test2.toString());
|
||||
CPPUNIT_ASSERT_EQUAL("15 s 985 ms 77 µs 600 ns"s, test2.toString(TimeSpanOutputFormat::WithMeasures));
|
||||
CPPUNIT_ASSERT_EQUAL("15.9850776"s, test2.toString(TimeSpanOutputFormat::TotalSeconds));
|
||||
|
||||
// test whether ConversionException() is thrown when invalid values are specified
|
||||
CPPUNIT_ASSERT_THROW(TimeSpan::fromString("2:34a:53:32.5"), ConversionException);
|
||||
}
|
||||
|
||||
/*!
|
||||
|
|
|
|||
|
|
@ -542,7 +542,6 @@ static int execAppInternal(const char *appPath, const char *const *args, std::st
|
|||
// get return code
|
||||
int childReturnCode;
|
||||
waitpid(child, &childReturnCode, 0);
|
||||
waitpid(-child, nullptr, 0);
|
||||
return childReturnCode;
|
||||
} else {
|
||||
// child process
|
||||
|
|
@ -554,12 +553,6 @@ static int execAppInternal(const char *appPath, const char *const *args, std::st
|
|||
close(readCerrPipe);
|
||||
close(writeCerrPipe);
|
||||
|
||||
// -> create process group
|
||||
if (setpgid(0, 0)) {
|
||||
cerr << Phrases::Error << "Unable create process group: " << std::strerror(errno) << Phrases::EndFlush;
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
// -> modify environment variable LLVM_PROFILE_FILE to apply new path for profiling output
|
||||
if (!newProfilingPath.empty()) {
|
||||
setenv("LLVM_PROFILE_FILE", newProfilingPath.data(), true);
|
||||
|
|
@ -568,11 +561,12 @@ static int execAppInternal(const char *appPath, const char *const *args, std::st
|
|||
// -> execute application
|
||||
if (enableSearchPath) {
|
||||
execvp(appPath, const_cast<char *const *>(args));
|
||||
|
||||
} else {
|
||||
execv(appPath, const_cast<char *const *>(args));
|
||||
}
|
||||
cerr << Phrases::Error << "Unable to execute \"" << appPath << "\": " << std::strerror(errno) << Phrases::EndFlush;
|
||||
exit(EXIT_FAILURE);
|
||||
cerr << Phrases::Error << "Unable to execute \"" << appPath << "\": execv() failed" << Phrases::EndFlush;
|
||||
exit(-101);
|
||||
}
|
||||
|
||||
#else
|
||||
|
|
@ -586,6 +580,7 @@ static int execAppInternal(const char *appPath, const char *const *args, std::st
|
|||
* \throws Throws std::runtime_error when the application can not be executed.
|
||||
* \remarks
|
||||
* - The specified \a args must be 0 terminated. The first argument is the application name.
|
||||
* - Currently only supported under UNIX.
|
||||
* - \a stdout and \a stderr are cleared before.
|
||||
*/
|
||||
int TestApplication::execApp(const char *const *args, string &output, string &errors, bool suppressLogging, int timeout) const
|
||||
|
|
@ -645,6 +640,7 @@ int TestApplication::execApp(const char *const *args, string &output, string &er
|
|||
* \remarks
|
||||
* - Intended to invoke helper applications (eg. to setup test files). Use execApp() and TestApplication::execApp() to
|
||||
* invoke the application to be tested itself.
|
||||
* - Currently only supported under UNIX.
|
||||
*/
|
||||
int execHelperApp(const char *appPath, const char *const *args, std::string &output, std::string &errors, bool suppressLogging, int timeout)
|
||||
{
|
||||
|
|
@ -659,6 +655,7 @@ int execHelperApp(const char *appPath, const char *const *args, std::string &out
|
|||
* \remarks
|
||||
* - Intended to invoke helper applications (eg. to setup test files). Use execApp() and TestApplication::execApp() to
|
||||
* invoke the application to be tested itself.
|
||||
* - Currently only supported under UNIX.
|
||||
*/
|
||||
int execHelperAppInSearchPath(
|
||||
const char *appName, const char *const *args, std::string &output, std::string &errors, bool suppressLogging, int timeout)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
#define TESTUTILS_H
|
||||
|
||||
#include "../application/argumentparser.h"
|
||||
#include "../chrono/format.h"
|
||||
#include "../misc/traits.h"
|
||||
|
||||
#include <iomanip>
|
||||
|
|
@ -14,12 +13,6 @@
|
|||
#define CPP_UTILITIES_HAS_EXEC_APP
|
||||
#endif
|
||||
|
||||
// ensure CppUnit's macros produce unique variable names when doing unity builds
|
||||
#if defined(__COUNTER__)
|
||||
#undef CPPUNIT_UNIQUE_COUNTER
|
||||
#define CPPUNIT_UNIQUE_COUNTER __COUNTER__
|
||||
#endif
|
||||
|
||||
namespace CppUtilities {
|
||||
|
||||
/*!
|
||||
|
|
|
|||
Loading…
Reference in New Issue