Merge from master + additional unix config/export polish

Author: Bret Ambrose

CMakeLists.txt

@@ -13,11 +13,14 @@
 # permissions and limitations under the License.
 #
 
-# minimum version of cmake that 
-#   (1) supports ExternalProject_Add URL_HASH
-#   (2) correctly extracts OPENSSL's version number from openssl/opensslv.h in version 1.0.2d
 cmake_minimum_required (VERSION 2.8.12)
 
+# 3.0 or higher is strongly suggested; build settings (target_compile_options/etc...) sometimes do not get propagated properly under certain conditions prior to this version
+# Making this a hard requirement is potentially disruptive to existing customers who aren't affected by the bad behavior though, so just warn for now
+if(CMAKE_MAJOR_VERSION LESS 3)
+    message(WARNING "Building with CMake 3.0 or higher is strongly suggested; current version is ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}")
+endif()
+
 # git is required for Android builds and optional for all other platforms
 find_package(Git)
 

android-unified-tests/CMakeLists.txt

@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 2.8.12)
 project(android-unified-tests)
 
 # Headers are included in the source so that they show up in Visual Studio.

aws-cpp-sdk-access-management/CMakeLists.txt

@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 2.8.12)
 add_project(aws-cpp-sdk-access-management 
     "C++ interface for Amazon Access Management"
     aws-cpp-sdk-cognito-identity 

aws-cpp-sdk-acm/CMakeLists.txt

@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 2.8.12)
 project(aws-cpp-sdk-acm)
 
   file(GLOB AWS_ACM_HEADERS

aws-cpp-sdk-acm/include/aws/acm/ACMClient.h

@@ -37,71 +37,71 @@ namespace Model
     Aws::Http::HeaderValueCollection GetRequestSpecificHeaders() const override;
 
     /**
-     * <p>String that contains the ARN of the ACM Certificate to which the tag is to be
-     * applied. This must be of the form:</p> <p>
-     * <code>arn:aws:acm:region:123456789012:certificate/12345678-1234-1234-1234-123456789012</code>
-     * </p> <p>For more information about ARNs, see <a
-     * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
+     * <p>String that contains the ARN of the ACM Certificate to which the tag is to be
+     * applied. This must be of the form:</p> <p>
+     * <code>arn:aws:acm:region:123456789012:certificate/12345678-1234-1234-1234-123456789012</code>
+     * </p> <p>For more information about ARNs, see <a
+     * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a>.</p>
      */
     inline const Aws::String& GetCertificateArn() const{ return m_certificateArn; }
 
     /**
-     * <p>String that contains the ARN of the ACM Certificate to which the tag is to be
-     * applied. This must be of the form:</p> <p>
-     * <code>arn:aws:acm:region:123456789012:certificate/12345678-1234-1234-1234-123456789012</code>
-     * </p> <p>For more information about ARNs, see <a
-     * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
+     * <p>String that contains the ARN of the ACM Certificate to which the tag is to be
+     * applied. This must be of the form:</p> <p>
+     * <code>arn:aws:acm:region:123456789012:certificate/12345678-1234-1234-1234-123456789012</code>
+     * </p> <p>For more information about ARNs, see <a
+     * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a>.</p>
      */
     inline void SetCertificateArn(const Aws::String& value) { m_certificateArnHasBeenSet = true; m_certificateArn = value; }
 
     /**
-     * <p>String that contains the ARN of the ACM Certificate to which the tag is to be
-     * applied. This must be of the form:</p> <p>
-     * <code>arn:aws:acm:region:123456789012:certificate/12345678-1234-1234-1234-123456789012</code>
-     * </p> <p>For more information about ARNs, see <a
-     * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
+     * <p>String that contains the ARN of the ACM Certificate to which the tag is to be
+     * applied. This must be of the form:</p> <p>
+     * <code>arn:aws:acm:region:123456789012:certificate/12345678-1234-1234-1234-123456789012</code>
+     * </p> <p>For more information about ARNs, see <a
+     * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a>.</p>
      */
     inline void SetCertificateArn(Aws::String&& value) { m_certificateArnHasBeenSet = true; m_certificateArn = value; }
 
     /**
-     * <p>String that contains the ARN of the ACM Certificate to which the tag is to be
-     * applied. This must be of the form:</p> <p>
-     * <code>arn:aws:acm:region:123456789012:certificate/12345678-1234-1234-1234-123456789012</code>
-     * </p> <p>For more information about ARNs, see <a
-     * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
+     * <p>String that contains the ARN of the ACM Certificate to which the tag is to be
+     * applied. This must be of the form:</p> <p>
+     * <code>arn:aws:acm:region:123456789012:certificate/12345678-1234-1234-1234-123456789012</code>
+     * </p> <p>For more information about ARNs, see <a
+     * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a>.</p>
      */
     inline void SetCertificateArn(const char* value) { m_certificateArnHasBeenSet = true; m_certificateArn.assign(value); }
 
     /**
-     * <p>String that contains the ARN of the ACM Certificate to which the tag is to be
-     * applied. This must be of the form:</p> <p>
-     * <code>arn:aws:acm:region:123456789012:certificate/12345678-1234-1234-1234-123456789012</code>
-     * </p> <p>For more information about ARNs, see <a
-     * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
+     * <p>String that contains the ARN of the ACM Certificate to which the tag is to be
+     * applied. This must be of the form:</p> <p>
+     * <code>arn:aws:acm:region:123456789012:certificate/12345678-1234-1234-1234-123456789012</code>
+     * </p> <p>For more information about ARNs, see <a
+     * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a>.</p>
      */
     inline AddTagsToCertificateRequest& WithCertificateArn(const Aws::String& value) { SetCertificateArn(value); return *this;}
 
     /**
-     * <p>String that contains the ARN of the ACM Certificate to which the tag is to be
-     * applied. This must be of the form:</p> <p>
-     * <code>arn:aws:acm:region:123456789012:certificate/12345678-1234-1234-1234-123456789012</code>
-     * </p> <p>For more information about ARNs, see <a
-     * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
+     * <p>String that contains the ARN of the ACM Certificate to which the tag is to be
+     * applied. This must be of the form:</p> <p>
+     * <code>arn:aws:acm:region:123456789012:certificate/12345678-1234-1234-1234-123456789012</code>
+     * </p> <p>For more information about ARNs, see <a
+     * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a>.</p>
      */
     inline AddTagsToCertificateRequest& WithCertificateArn(Aws::String&& value) { SetCertificateArn(value); return *this;}
 
     /**
-     * <p>String that contains the ARN of the ACM Certificate to which the tag is to be
-     * applied. This must be of the form:</p> <p>
-     * <code>arn:aws:acm:region:123456789012:certificate/12345678-1234-1234-1234-123456789012</code>
-     * </p> <p>For more information about ARNs, see <a
-     * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
+     * <p>String that contains the ARN of the ACM Certificate to which the tag is to be
+     * applied. This must be of the form:</p> <p>
+     * <code>arn:aws:acm:region:123456789012:certificate/12345678-1234-1234-1234-123456789012</code>
+     * </p> <p>For more information about ARNs, see <a
+     * href="http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">Amazon
      * Resource Names (ARNs) and AWS Service Namespaces</a>.</p>
      */
     inline AddTagsToCertificateRequest& WithCertificateArn(const char* value) { SetCertificateArn(value); return *this;}