Fix compiler warning for incomptible flags /O2 and /RTC1

singku · web-flow · commit a9d28a0f1b47 · 2019-03-23T17:55:26.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -70,10 +70,13 @@ option(ENABLE_ADDRESS_SANITIZER "Flags to enable/disable Address Sanitizer for g
 option(BYPASS_DEFAULT_PROXY "Bypass the machine's default proxy settings when using IXmlHttpRequest2" ON)
 option(BUILD_DEPS "Build third-party dependencies" ON)
 
-
 set(BUILD_ONLY "" CACHE STRING "A semi-colon delimited list of the projects to build")
 set(CPP_STANDARD "11" CACHE STRING "Flag to upgrade the C++ standard used. The default is 11. The minimum is 11.")
 
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Release)
+endif()
+
 # backwards compatibility with old command line params
 if("${STATIC_LINKING}" STREQUAL "1")
     set(BUILD_SHARED_LIBS OFF)
@@ -106,6 +109,11 @@ endif()
 
 include(initialize_project_version)
 
+if (BUILD_SHARED_LIBS OR FORCE_SHARED_CRT)
+    set(STATIC_CRT OFF)
+else()
+    set(STATIC_CRT ON)
+endif()
 
 # build third-party targets
 if (BUILD_DEPS)
@@ -163,6 +171,7 @@ if (BUILD_DEPS)
             -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
             -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
             -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+            -DSTATIC_CRT=${STATIC_CRT}
             -DCMAKE_INSTALL_PREFIX=${AWS_DEPS_INSTALL_DIR}
             -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_CURRENT_BINARY_DIR}/bin
             ${CMAKE_CURRENT_SOURCE_DIR}/third-party
diff --git a/README.md b/README.md
@@ -52,10 +52,10 @@ You can use the following variations to create your build directory:
 * For Visual Studio:
 `msbuild ALL_BUILD.vcxproj`
 
-##### To create a **release build**, do one of the following:
+##### The default build type is Release, to create a **Debug build**, do one of the following:
 * For Auto Make build systems:
 ```
-cmake -DCMAKE_BUILD_TYPE=Release  <path-to-root-of-this-source-code>
+cmake -DCMAKE_BUILD_TYPE=Debug  <path-to-root-of-this-source-code>
 make
 sudo make install
 ```
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
@@ -8,26 +8,22 @@ project(AWSSDK_DEPS)
 
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 
-if(NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE Release)
-endif()
-
 include(ExternalProject)
 
 set(AWS_DEPS_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}" CACHE PATH "Dependencies install directory.")
 set(AWS_DEPS_BUILD_DIR "${CMAKE_BINARY_DIR}/build" CACHE PATH "Dependencies build directory.")
 set(AWS_DEPS_DOWNLOAD_DIR "${AWS_DEPS_BUILD_DIR}/downloads" CACHE PATH "Dependencies download directory.")
 
 set(AWS_C_COMMON_URL "https://github.com/awslabs/aws-c-common.git")
-set(AWS_C_COMMON_TAG "f5383755e934745811d777a8e6c6866791b4302e")
+set(AWS_C_COMMON_TAG "ac02e17")
 include(BuildAwsCCommon)
 
 set(AWS_CHECKSUMS_URL "https://github.com/awslabs/aws-checksums.git")
-set(AWS_CHECKSUMS_TAG "v0.1.2")
+set(AWS_CHECKSUMS_TAG "41dc36d")
 include(BuildAwsChecksums)
 
 set(AWS_EVENT_STREAM_URL "https://github.com/awslabs/aws-c-event-stream.git")
-set(AWS_EVENT_STREAM_TAG "v0.1.1")
+set(AWS_EVENT_STREAM_TAG "97ab2e5")
 include(BuildAwsEventStream)
 
 add_dependencies(AwsCEventStream AwsCCommon AwsChecksums)
diff --git a/third-party/cmake/BuildAwsCCommon.cmake b/third-party/cmake/BuildAwsCCommon.cmake
@@ -46,6 +46,7 @@ else()
         -DCMAKE_INSTALL_PREFIX=${AWS_DEPS_INSTALL_DIR}
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
         -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+        -DSTATIC_CRT=${STATIC_CRT}
         -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
         -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
         )
diff --git a/third-party/cmake/BuildAwsChecksums.cmake b/third-party/cmake/BuildAwsChecksums.cmake
@@ -45,6 +45,7 @@ else()
         -DCMAKE_INSTALL_PREFIX=${AWS_DEPS_INSTALL_DIR}
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
         -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+        -DSTATIC_CRT=${STATIC_CRT}
         -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
         -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
         )
diff --git a/third-party/cmake/BuildAwsEventStream.cmake b/third-party/cmake/BuildAwsEventStream.cmake
@@ -53,6 +53,7 @@ else()
         -DCMAKE_PREFIX_PATH=${AWS_DEPS_INSTALL_DIR}
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
         -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+        -DSTATIC_CRT=${STATIC_CRT}
         -DCMAKE_INSTALL_RPATH=${DEPS_RPATH}
         -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
         -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ else()`
`46`	`46`	`-DCMAKE_INSTALL_PREFIX=${AWS_DEPS_INSTALL_DIR}`
`47`	`47`	`-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}`
`48`	`48`	`-DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}`
	`49`	`+ -DSTATIC_CRT=${STATIC_CRT}`
`49`	`50`	`-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}`
`50`	`51`	`-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}`
`51`	`52`	`)`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ else()`
`45`	`45`	`-DCMAKE_INSTALL_PREFIX=${AWS_DEPS_INSTALL_DIR}`
`46`	`46`	`-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}`
`47`	`47`	`-DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}`
	`48`	`+ -DSTATIC_CRT=${STATIC_CRT}`
`48`	`49`	`-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}`
`49`	`50`	`-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}`
`50`	`51`	`)`