Merge branch 'http-pipeline-refactor' into development

Conflicts: Release/src/http/common/http_helpers.cpp
jasonsandlin · Apr 14, 2016 · 621f0da · 621f0da
2 parents f4c8a47 + 479ebe7
commit 621f0da
Show file tree

Hide file tree

Showing 30 changed files with 1,484 additions and 1,525 deletions.
diff --git a/Release/CMakeLists.txt b/Release/CMakeLists.txt
@@ -160,6 +160,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
   message("-- Setting msvc options")
   set(WARNINGS)
+  add_compile_options(/bigobj)
 else()
   message("-- Unknown compiler, success is doubtful.")
   message("CMAKE_CXX_COMPILER_ID=${CMAKE_CXX_COMPILER_ID}")