Define subparts of the version in cmake rather than in a header file

This simplifies our build process. Since we derive the version from git
tags, we run into a chicken/egg problem. change the file and tag it, or
tag it and derive the version from the tag.

Author: Marco Magdy

aws-cpp-sdk-core-tests/CMakeLists.txt

@@ -22,6 +22,7 @@ file(GLOB UTILS_XML_SRC "${CMAKE_CURRENT_SOURCE_DIR}/utils/memory/*.cpp")
 
 file(GLOB AWS_CPP_SDK_CORE_TESTS_SRC
   "${CMAKE_CURRENT_SOURCE_DIR}/RunTests.cpp"
+  "${CMAKE_CURRENT_SOURCE_DIR}/VersionTests.cpp"
   ${AWS_SRC}
   ${AWS_AUTH_SRC}
   ${AWS_CONFIG_SRC}

aws-cpp-sdk-core-tests/VersionTests.cpp

@@ -0,0 +1,35 @@
+/*
+* Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License").
+* You may not use this file except in compliance with the License.
+* A copy of the License is located at
+*
+*  http://aws.amazon.com/apache2.0
+*
+* or in the "license" file accompanying this file. This file is distributed
+* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+* express or implied. See the License for the specific language governing
+* permissions and limitations under the License.
+*/
+
+#include <aws/external/gtest.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/Version.h>
+
+using namespace Aws::Version;
+
+TEST(VersionTest, TestMajorMinorPatch)
+{
+    auto major = GetVersionMajor();
+    auto minor = GetVersionMinor();
+    auto patch = GetVersionPatch();
+    Aws::String version;
+    version += Aws::Utils::StringUtils::to_string(major);
+    version += ".";
+    version += Aws::Utils::StringUtils::to_string(minor);
+    version += ".";
+    version += Aws::Utils::StringUtils::to_string(patch);
+    auto versionString = GetVersionString();
+    ASSERT_STREQ(versionString, version.c_str());
+}

aws-cpp-sdk-core/CMakeLists.txt

@@ -316,6 +316,10 @@ endif(MSVC)
 add_library(${PROJECT_NAME} ${LIBTYPE} ${AWS_NATIVE_SDK_SRC})
 add_library(AWS::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 
+target_compile_definitions(${PROJECT_NAME} PUBLIC "AWS_SDK_VERSION_MAJOR=${AWSSDK_VERSION_MAJOR}")
+target_compile_definitions(${PROJECT_NAME} PUBLIC "AWS_SDK_VERSION_MINOR=${AWSSDK_VERSION_MINOR}")
+target_compile_definitions(${PROJECT_NAME} PUBLIC "AWS_SDK_VERSION_PATCH=${AWSSDK_VERSION_PATCH}")
+
 set(Core_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/include/")
 
 if(PLATFORM_CUSTOM)

aws-cpp-sdk-core/include/aws/core/Version.h

@@ -19,6 +19,9 @@ namespace Aws
 {
 namespace Version
 {
-AWS_CORE_API const char* GetVersionString();
+    AWS_CORE_API const char* GetVersionString();
+    AWS_CORE_API unsigned GetVersionMajor();
+    AWS_CORE_API unsigned GetVersionMinor();
+    AWS_CORE_API unsigned GetVersionPatch();
 } //namespace Version
 } //namespace Aws

aws-cpp-sdk-core/include/aws/core/VersionConfig.h.in

@@ -14,6 +14,3 @@
   */
 
 #define AWS_SDK_VERSION_STRING "@AWSSDK_VERSION_STRING@"
-#define AWS_SDK_VERSION_MAJOR  @AWSSDK_VERSION_MAJOR@
-#define AWS_SDK_VERSION_MINOR  @AWSSDK_VERSION_MINOR@
-#define AWS_SDK_VERSION_PATCH  @AWSSDK_VERSION_PATCH@

aws-cpp-sdk-core/source/Version.cpp

@@ -24,6 +24,21 @@ namespace Version
   {
     return AWS_SDK_VERSION_STRING;
   }
+
+  unsigned GetVersionMajor()
+  {
+    return AWS_SDK_VERSION_MAJOR;
+  }
+
+  unsigned GetVersionMinor()
+  {
+    return AWS_SDK_VERSION_MINOR;
+  }
+
+  unsigned GetVersionPatch()
+  {
+    return AWS_SDK_VERSION_PATCH;
+  }
 } //namespace Version
 } //namespace Aws