diff --git a/src/version.cpp b/src/version.cpp index 73330c2e..e24ebb30 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -14,17 +14,15 @@ #endif char const *get_package_version_string() { - // The following conditional should be simplified by the compiler. - if (strlen(BUILD_VERSION_STRING) == 0) { - // Fallback if version string can't be obtained from Git -#ifndef PACKAGE_VERSION_RC - return "v" EXPAND_AND_STR(PACKAGE_VERSION_MAJOR) "." EXPAND_AND_STR(PACKAGE_VERSION_MINOR - ) "." EXPAND_AND_STR(PACKAGE_VERSION_PATCH); -#else - return "v" EXPAND_AND_STR(PACKAGE_VERSION_MAJOR) "." EXPAND_AND_STR(PACKAGE_VERSION_MINOR - ) "." EXPAND_AND_STR(PACKAGE_VERSION_PATCH) "-rc" EXPAND_AND_STR(PACKAGE_VERSION_RC); -#endif - } else { + if constexpr (QUOTEDSTRLEN(BUILD_VERSION_STRING) > 0) { return BUILD_VERSION_STRING; } + // Fallback if version string can't be obtained from Git +#ifndef PACKAGE_VERSION_RC + return "v" EXPAND_AND_STR(PACKAGE_VERSION_MAJOR) "." EXPAND_AND_STR(PACKAGE_VERSION_MINOR + ) "." EXPAND_AND_STR(PACKAGE_VERSION_PATCH); +#else + return "v" EXPAND_AND_STR(PACKAGE_VERSION_MAJOR) "." EXPAND_AND_STR(PACKAGE_VERSION_MINOR + ) "." EXPAND_AND_STR(PACKAGE_VERSION_PATCH) "-rc" EXPAND_AND_STR(PACKAGE_VERSION_RC); +#endif }