Skip to content

Commit 7908918

Browse files
authored
Merge pull request #42 from awslabs/FB-AndroidFixes
Build machines complaining
2 parents 981a823 + afb5d90 commit 7908918

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,12 @@ if(COMMAND apply_pre_project_platform_settings)
8080
endif()
8181

8282
include(initialize_project_version)
83+
84+
cmake_policy(SET CMP0028 NEW)
85+
cmake_policy(SET CMP0048 NEW)
86+
cmake_policy(SET CMP0054 NEW)
87+
cmake_policy(SET CMP0056 NEW)
88+
8389
project("aws-cpp-sdk-all" VERSION "${PROJECT_VERSION}" LANGUAGES CXX)
8490

8591
# http client, encryption, zlib, uuid

cmake/initialize_project_version.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ macro(add_project name description)
2626
list(APPEND PROJECT_LIBS "${library_var}")
2727
endforeach()
2828

29-
cmake_policy(SET CMP0028 NEW)
30-
cmake_policy(SET CMP0048 NEW)
31-
cmake_policy(SET CMP0054 NEW)
32-
cmake_policy(SET CMP0056 NEW)
3329
project(${name} VERSION "${PROJECT_VERSION}" LANGUAGES CXX)
3430

3531
endmacro()

0 commit comments

Comments
 (0)