Browse Source

Merge pull request #11190 from xwang2713/HPCC_19720-SQS-build

HPCC-19720 Suppress build warnings for SQS on Ubuntu 18.04

Reviewed-By: Michael Gardner <michael.gardner@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 7 years ago
parent
commit
39218fa60f
1 changed files with 5 additions and 2 deletions
  1. 5 2
      plugins/sqs/CMakeLists.txt

+ 5 - 2
plugins/sqs/CMakeLists.txt

@@ -8,13 +8,16 @@ project(sqs)
 if(SQS)
     ADD_PLUGIN(sqs)
     set(AWS_SDK_CPP_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/aws-sdk-cpp)
+    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)
+      set(EXTERNAL_SQS_CXX_FLAGS "-Wno-error=implicit-fallthrough -Wno-error=int-in-bool-context -Wno-error=format-nonliteral" )
+    endif()
     include(ExternalProject)
     ExternalProject_Add(
         aws-sdk-cpp
         SOURCE_DIR ${AWS_SDK_CPP_SOURCE_DIR}
         BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/aws-sdk-cpp
-        CMAKE_ARGS -DCUSTOM_MEMORY_MANAGEMENT:string=0
-        BUILD_COMMAND $(MAKE) CPPFLAGS=-Wno-error=implicit-fallthrough LDFLAGS=-Wl,-rpath-link,${LIB_PATH} aws-cpp-sdk-sqs
+        CMAKE_ARGS -DCUSTOM_MEMORY_MANAGEMENT:string=0 -DCMAKE_CXX_FLAGS=${EXTERNAL_SQS_CXX_FLAGS}
+        BUILD_COMMAND $(MAKE) LDFLAGS=-Wl,-rpath-link,${LIB_PATH} aws-cpp-sdk-sqs
         INSTALL_COMMAND "")
     add_library(aws-cpp-sdk-core SHARED IMPORTED)
     add_library(aws-cpp-sdk-sqs SHARED IMPORTED)