commit a434f2bde1f80e1a0ddcda0961a7ff102de152d6
author Ed Tanous <ed.tanous@intel.com> Fri Jul 27 13:04:22 2018 -0700
committer Ed Tanous <ed.tanous@intel.com> Thu Aug 09 11:32:53 2018 -0700
tree 2c1bed74b47e4129add2ea0c8e5158bdd35ce96a
parent 1b0044bb9a92cd90a59dae1786640411e40ca3f3

Fix merge conflict

Got a couple patches that collided in air, and now builds are broken.
This resolves the collision by moving the new patches forward to the
latest #defines

Change-Id: I1fe35d17a68c61ad90752ae73000e2579131bf5d
Signed-off-by: Ed Tanous <ed.tanous@intel.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce0006b..33d3ec5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -139,7 +139,7 @@
 endif (CMAKE_BUILD_TYPE MATCHES Debug)
 
 if (NOT "${BMCWEB_INSECURE_DISABLE_SSL}")
-    add_definitions (-DCROW_ENABLE_SSL)
+    add_definitions (-DBMCWEB_ENABLE_SSL)
 endif (NOT "${BMCWEB_INSECURE_DISABLE_SSL}")
 include_directories (${CMAKE_CURRENT_SOURCE_DIR}/crow/include)