Merge pull request #37 from awslabs/FB-CMakeVersionBump

JonathanHenson · web-flow · commit aa887727d9ce · 2016-11-03T09:20:56.000-07:00
Improve CMake version check
diff --git a/CMakeLists.txt b/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)
 
diff --git a/android-unified-tests/CMakeLists.txt b/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.
diff --git a/aws-cpp-sdk-access-management/CMakeLists.txt b/aws-cpp-sdk-access-management/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 2.8.12)
 project(aws-cpp-sdk-access-management)
 
 file(GLOB AWS_ACCESS_MANAGEMENT_HEADERS
diff --git a/aws-cpp-sdk-cloudfront-integration-tests/CMakeLists.txt b/aws-cpp-sdk-cloudfront-integration-tests/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 2.8.12)
 project(aws-cpp-sdk-sqs-cloudfront-tests)
 
 # Headers are included in the source so that they show up in Visual Studio.
diff --git a/aws-cpp-sdk-cognitoidentity-integration-tests/CMakeLists.txt b/aws-cpp-sdk-cognitoidentity-integration-tests/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 2.8.12)
 project(aws-cpp-sdk-cognitoidentity-integration-tests)
 
 # Headers are included in the source so that they show up in Visual Studio.
diff --git a/aws-cpp-sdk-core-tests/CMakeLists.txt b/aws-cpp-sdk-core-tests/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 2.8.12)
 project(aws-cpp-sdk-core-tests)
 
 # Headers are included in the source so that they show up in Visual Studio.
diff --git a/aws-cpp-sdk-core/CMakeLists.txt b/aws-cpp-sdk-core/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 2.8.12)
 project(aws-cpp-sdk-core)
 
 if(GIT_FOUND)
diff --git a/aws-cpp-sdk-dynamodb-integration-tests/CMakeLists.txt b/aws-cpp-sdk-dynamodb-integration-tests/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 2.8.12)
 project(aws-cpp-sdk-dynamodb-integration-tests)
 
 # Headers are included in the source so that they show up in Visual Studio.
diff --git a/aws-cpp-sdk-identity-management-tests/CMakeLists.txt b/aws-cpp-sdk-identity-management-tests/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 2.8.12)
 project(aws-cpp-sdk-identity-management-tests)
 
 # Headers are included in the source so that they show up in Visual Studio.
diff --git a/aws-cpp-sdk-identity-management/CMakeLists.txt b/aws-cpp-sdk-identity-management/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 2.8.12)
 project(aws-cpp-sdk-identity-management)
 
 file(GLOB AWS_IDENTITY_PROVIDER_HEADERS
diff --git a/aws-cpp-sdk-lambda-integration-tests/CMakeLists.txt b/aws-cpp-sdk-lambda-integration-tests/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 2.8.12)
 project(aws-cpp-sdk-lambda-integration-tests)
 
 # Headers are included in the source so that they show up in Visual Studio.
diff --git a/aws-cpp-sdk-queues/CMakeLists.txt b/aws-cpp-sdk-queues/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 2.6)
 project(aws-cpp-sdk-queues)
 
 file(GLOB AWS_QUEUES_HEADERS
diff --git a/aws-cpp-sdk-redshift-integration-tests/CMakeLists.txt b/aws-cpp-sdk-redshift-integration-tests/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 2.8.12)
 project(aws-cpp-sdk-redshift-integration-tests)
 
 # Headers are included in the source so that they show up in Visual Studio.
diff --git a/aws-cpp-sdk-s3-integration-tests/CMakeLists.txt b/aws-cpp-sdk-s3-integration-tests/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 2.8.12)
 project(aws-cpp-sdk-s3-integration-tests)
 
 # Headers are included in the source so that they show up in Visual Studio.
diff --git a/aws-cpp-sdk-sqs-integration-tests/CMakeLists.txt b/aws-cpp-sdk-sqs-integration-tests/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 2.8.12)
 project(aws-cpp-sdk-sqs-integration-tests)
 
 # Headers are included in the source so that they show up in Visual Studio.
diff --git a/aws-cpp-sdk-transfer-tests/CMakeLists.txt b/aws-cpp-sdk-transfer-tests/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 2.8.12)
 project(aws-cpp-sdk-transfer-integration-tests)
 
 # Headers are included in the source so that they show up in Visual Studio.
diff --git a/aws-cpp-sdk-transfer/CMakeLists.txt b/aws-cpp-sdk-transfer/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 2.8.12)
 project(aws-cpp-sdk-transfer)
 
 file( GLOB TRANSFER_HEADERS "include/aws/transfer/*.h" )
diff --git a/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/CMakeFile.vm b/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/CMakeFile.vm
@@ -1,5 +1,4 @@
 #set($metadata = $serviceModel.metadata)
-cmake_minimum_required(VERSION 2.8.12)
 project(aws-cpp-sdk-${metadata.projectName})
 
 #set($projectNameCaps = $metadata.projectName.toUpperCase())
diff --git a/testing-resources/CMakeLists.txt b/testing-resources/CMakeLists.txt
@@ -13,7 +13,6 @@
 # permissions and limitations under the License.
 #
 
-cmake_minimum_required(VERSION 2.8.12)
 project(testing-resources)
 include(GenerateExportHeader)
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-cmake_minimum_required(VERSION 2.8.12)`
`2`	`1`	`project(android-unified-tests)`
`3`	`2`
`4`	`3`	`# Headers are included in the source so that they show up in Visual Studio.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-cmake_minimum_required(VERSION 2.8.12)`
`2`	`1`	`project(aws-cpp-sdk-access-management)`
`3`	`2`
`4`	`3`	`file(GLOB AWS_ACCESS_MANAGEMENT_HEADERS`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-cmake_minimum_required(VERSION 2.8.12)`
`2`	`1`	`project(aws-cpp-sdk-sqs-cloudfront-tests)`
`3`	`2`
`4`	`3`	`# Headers are included in the source so that they show up in Visual Studio.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-cmake_minimum_required(VERSION 2.8.12)`
`2`	`1`	`project(aws-cpp-sdk-cognitoidentity-integration-tests)`
`3`	`2`
`4`	`3`	`# Headers are included in the source so that they show up in Visual Studio.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-cmake_minimum_required(VERSION 2.8.12)`
`2`	`1`	`project(aws-cpp-sdk-core-tests)`
`3`	`2`
`4`	`3`	`# Headers are included in the source so that they show up in Visual Studio.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-cmake_minimum_required(VERSION 2.8.12)`
`2`	`1`	`project(aws-cpp-sdk-core)`
`3`	`2`
`4`	`3`	`if(GIT_FOUND)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-cmake_minimum_required(VERSION 2.8.12)`
`2`	`1`	`project(aws-cpp-sdk-dynamodb-integration-tests)`
`3`	`2`
`4`	`3`	`# Headers are included in the source so that they show up in Visual Studio.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-cmake_minimum_required(VERSION 2.8.12)`
`2`	`1`	`project(aws-cpp-sdk-identity-management-tests)`
`3`	`2`
`4`	`3`	`# Headers are included in the source so that they show up in Visual Studio.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-cmake_minimum_required(VERSION 2.8.12)`
`2`	`1`	`project(aws-cpp-sdk-lambda-integration-tests)`
`3`	`2`
`4`	`3`	`# Headers are included in the source so that they show up in Visual Studio.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-cmake_minimum_required(VERSION 2.6)`
`2`	`1`	`project(aws-cpp-sdk-queues)`
`3`	`2`
`4`	`3`	`file(GLOB AWS_QUEUES_HEADERS`