From 30e820c6db9b56f2321bfee2afe95f8dd4c9584c Mon Sep 17 00:00:00 2001 From: Keef Aragon Date: Thu, 7 Mar 2019 23:52:14 -0800 Subject: [PATCH 1/2] Fix CMAKE flags going to thirdparty libs on Linux/Windows --- CMakeLists.txt | 9 ++++++--- third-party/cmake/BuildAwsCCommon.cmake | 1 + third-party/cmake/BuildAwsChecksums.cmake | 1 + third-party/cmake/BuildAwsEventStream.cmake | 1 + 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 780a437baf7..7c93e91848f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,6 +27,9 @@ if(POLICY CMP0056) cmake_policy(SET CMP0056 NEW) endif() +# build the sdk targets +project("aws-cpp-sdk-all" VERSION "${PROJECT_VERSION}" LANGUAGES CXX) + # 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) @@ -165,6 +168,9 @@ if (BUILD_DEPS) -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DCMAKE_INSTALL_PREFIX=${AWS_DEPS_INSTALL_DIR} -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_CURRENT_BINARY_DIR}/bin + -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} + -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} + -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/third-party WORKING_DIRECTORY ${AWS_DEPS_BUILD_DIR} RESULT_VARIABLE BUILD_3P_EXIT_CODE) @@ -183,9 +189,6 @@ if (BUILD_DEPS) list(APPEND CMAKE_PREFIX_PATH "${AWS_DEPS_INSTALL_DIR}") endif() -# build the sdk targets -project("aws-cpp-sdk-all" VERSION "${PROJECT_VERSION}" LANGUAGES CXX) - # http client, encryption, zlib include(external_dependencies) diff --git a/third-party/cmake/BuildAwsCCommon.cmake b/third-party/cmake/BuildAwsCCommon.cmake index 8569751d944..813147426f8 100644 --- a/third-party/cmake/BuildAwsCCommon.cmake +++ b/third-party/cmake/BuildAwsCCommon.cmake @@ -48,5 +48,6 @@ else() -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} + -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} ) endif() diff --git a/third-party/cmake/BuildAwsChecksums.cmake b/third-party/cmake/BuildAwsChecksums.cmake index d1fcf9e5c21..c8ecc01ac38 100644 --- a/third-party/cmake/BuildAwsChecksums.cmake +++ b/third-party/cmake/BuildAwsChecksums.cmake @@ -47,6 +47,7 @@ else() -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} + -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} ) endif() diff --git a/third-party/cmake/BuildAwsEventStream.cmake b/third-party/cmake/BuildAwsEventStream.cmake index 49590fccef8..c1ae0db1904 100644 --- a/third-party/cmake/BuildAwsEventStream.cmake +++ b/third-party/cmake/BuildAwsEventStream.cmake @@ -56,5 +56,6 @@ else() -DCMAKE_INSTALL_RPATH=${DEPS_RPATH} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} + -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} ) endif() From 6eb1b5cdf957c282c14d085dfd08c98b3d434f55 Mon Sep 17 00:00:00 2001 From: Keef Aragon Date: Fri, 8 Mar 2019 03:11:53 -0800 Subject: [PATCH 2/2] Extra whitespace --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c93e91848f..299ff9f096a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -169,7 +169,7 @@ if (BUILD_DEPS) -DCMAKE_INSTALL_PREFIX=${AWS_DEPS_INSTALL_DIR} -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_CURRENT_BINARY_DIR}/bin -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} - -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} + -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/third-party WORKING_DIRECTORY ${AWS_DEPS_BUILD_DIR}