Removed Git SHA1 from version because it won't build using vcpkg

glynos · glynos · commit b194e7279e36 · 2020-05-04T12:42:04.000+02:00
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -3,10 +3,6 @@
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
 
-include(${PROJECT_SOURCE_DIR}/cmake/skyr-url-git.cmake)
-
-skyr_get_git_sha1(skyr-url_VERSION_SHA1)
-
 configure_file(
         version.hpp.in
         ${PROJECT_BINARY_DIR}/include/skyr/version.hpp
diff --git a/src/version.hpp.in b/src/version.hpp.in
@@ -15,7 +15,6 @@
 #define SKYR_VERSION_MAJOR @skyr-url_VERSION_MAJOR@
 #define SKYR_VERSION_MINOR @skyr-url_VERSION_MINOR@
 #define SKYR_VERSION_PATCH @skyr-url_VERSION_PATCH@
-#define SKYR_VERSION_SHA1 "@skyr-url_VERSION_SHA1@"
 
 #define SKYR_VERSION_STRING \
   SKYR_PREPROCESSOR_TO_STRING(SKYR_VERSION_MAJOR) "." \
@@ -24,26 +23,25 @@
 #define SKYR_RELEASE_STRING \
   SKYR_PREPROCESSOR_TO_STRING(SKYR_VERSION_MAJOR) "." \
   SKYR_PREPROCESSOR_TO_STRING(SKYR_VERSION_MINOR) "." \
-  SKYR_PREPROCESSOR_TO_STRING(SKYR_VERSION_PATCH) "-" \
-  SKYR_VERSION_SHA1
+  SKYR_PREPROCESSOR_TO_STRING(SKYR_VERSION_PATCH) "-"
 
 namespace skyr {
 /// \returns The majo, minor version as a tuple
 static constexpr auto version() noexcept -> std::tuple<int, int> {
   return {SKYR_VERSION_MAJOR, SKYR_VERSION_MINOR};
 }
 
-/// \returns The major, minor, patch and Git sha1 as a tuple
-static constexpr auto release() noexcept -> std::tuple<int, int, int, std::string_view> {
-  return {SKYR_VERSION_MAJOR, SKYR_VERSION_MINOR, SKYR_VERSION_PATCH, SKYR_VERSION_SHA1};
+/// \returns The major, minor, patch as a tuple
+static constexpr auto release() noexcept -> std::tuple<int, int, int> {
+  return {SKYR_VERSION_MAJOR, SKYR_VERSION_MINOR, SKYR_VERSION_PATCH};
 }
 
 /// \returns The version as a string in the form MAJOR.MINOR
 static constexpr auto version_string() noexcept -> std::string_view {
   return SKYR_VERSION_STRING;
 }
 
-/// \returns The version as a string in the form MAJOR.MINOR.PATCH-SHA1
+/// \returns The version as a string in the form MAJOR.MINOR.PATCH
 static constexpr auto release_string() noexcept -> std::string_view {
   return SKYR_RELEASE_STRING;
 }
