diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2018-11-14 14:49:59 -0800 |
|---|---|---|
| committer | Ed Tanous <ed.tanous@intel.com> | 2018-11-16 00:56:37 +0000 |
| commit | c50fc5a2ff5e44dc9367305cb106fe20102cde6a (patch) | |
| tree | f4733f7b9ba66ea68dedc3730d44241dc76ad964 | |
| parent | a08b46ccf0fc0081cecc4843484c4f0eb13f5a9a (diff) | |
| download | bmcweb-c50fc5a2ff5e44dc9367305cb106fe20102cde6a.tar.gz bmcweb-c50fc5a2ff5e44dc9367305cb106fe20102cde6a.zip | |
Use target_compile_definitions() for build flags
This change moves the bmcweb build flags out of settings.hpp
and into the CMakeLists.txt file as target_compile_definitions().
This makes it so it is no longer required to #include settings.hpp
to use build flags in the source.
Tested: Enabled and disabled some Redfish flags and confirmed that
the desired components were added and removed.
Change-Id: Ibeedb4fc8f3dcc286c73843823693a04c55c0615
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
| -rw-r--r-- | CMakeLists.txt | 15 | ||||
| -rw-r--r-- | settings.hpp.in | 12 | ||||
| -rw-r--r-- | src/webserver_main.cpp | 1 |
3 files changed, 14 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 80c132b..50a6bd4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -172,7 +172,6 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include) include_directories (${CMAKE_CURRENT_SOURCE_DIR}/redfish-core/include) file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/include/bmcweb) -configure_file (settings.hpp.in ${CMAKE_BINARY_DIR}/include/bmcweb/settings.hpp) include_directories (${CMAKE_BINARY_DIR}/include) set ( @@ -240,3 +239,17 @@ install (TARGETS bmcweb DESTINATION bin) add_executable (getvideo src/getvideo_main.cpp) target_link_libraries (getvideo pthread) + +target_compile_definitions ( + bmcweb PRIVATE + $<$<BOOL:${BMCWEB_ENABLE_KVM}>: -DBMCWEB_ENABLE_KVM> + $<$<BOOL:${BMCWEB_ENABLE_DBUS_REST}>: -DBMCWEB_ENABLE_DBUS_REST> + $<$<BOOL:${BMCWEB_ENABLE_REDFISH}>: -DBMCWEB_ENABLE_REDFISH> + $<$<BOOL:${BMCWEB_ENABLE_STATIC_HOSTING}>: -DBMCWEB_ENABLE_STATIC_HOSTING> + $<$<BOOL:${BMCWEB_ENABLE_HOST_SERIAL_WEBSOCKET}>: -DBMCWEB_ENABLE_HOST_SERIAL_WEBSOCKET> + $<$<BOOL:${BMCWEB_INSECURE_DISABLE_CSRF_PREVENTION}>: -DBMCWEB_INSECURE_DISABLE_CSRF_PREVENTION> + $<$<BOOL:${BMCWEB_INSECURE_DISABLE_SSL}>: -DBMCWEB_INSECURE_DISABLE_SSL> + $<$<BOOL:${BMCWEB_INSECURE_DISABLE_XSS_PREVENTION}>: -DBMCWEB_INSECURE_DISABLE_XSS_PREVENTION> + $<$<BOOL:${BMCWEB_ENABLE_REDFISH_RAW_PECI}>: -DBMCWEB_ENABLE_REDFISH_RAW_PECI> + $<$<BOOL:${BMCWEB_ENABLE_REDFISH_CPU_LOG}>: -DBMCWEB_ENABLE_REDFISH_CPU_LOG> +)
\ No newline at end of file diff --git a/settings.hpp.in b/settings.hpp.in deleted file mode 100644 index ecb17ed..0000000 --- a/settings.hpp.in +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#cmakedefine BMCWEB_ENABLE_KVM -#cmakedefine BMCWEB_ENABLE_DBUS_REST -#cmakedefine BMCWEB_ENABLE_REDFISH -#cmakedefine BMCWEB_ENABLE_STATIC_HOSTING -#cmakedefine BMCWEB_ENABLE_HOST_SERIAL_WEBSOCKET -#cmakedefine BMCWEB_INSECURE_DISABLE_CSRF_PREVENTION -#cmakedefine BMCWEB_INSECURE_DISABLE_SSL -#cmakedefine BMCWEB_INSECURE_DISABLE_XSS_PREVENTION -#cmakedefine BMCWEB_ENABLE_REDFISH_RAW_PECI -#cmakedefine BMCWEB_ENABLE_REDFISH_CPU_LOG diff --git a/src/webserver_main.cpp b/src/webserver_main.cpp index d141841..fc2638a 100644 --- a/src/webserver_main.cpp +++ b/src/webserver_main.cpp @@ -1,7 +1,6 @@ #include <crow/app.h> #include <systemd/sd-daemon.h> -#include <bmcweb/settings.hpp> #include <boost/asio.hpp> #include <dbus_monitor.hpp> #include <dbus_singleton.hpp> |
