diff options
| author | Ed Tanous <ed.tanous@intel.com> | 2018-02-07 03:30:36 +0300 |
|---|---|---|
| committer | Ed Tanous <ed.tanous@intel.com> | 2018-02-09 20:54:41 +0300 |
| commit | 465b12abfe1775e89ef83b080297e59c3c432adc (patch) | |
| tree | a4a3f395428ba23083f7d5af63e3243070ffc4d8 | |
| parent | 2b7981f6e53f76c662d427ced8bd9cffc5dde695 (diff) | |
| download | bmcweb-465b12abfe1775e89ef83b080297e59c3c432adc.tar.xz | |
Make bmcweb use yocto dependency management
bmcweb will still build with submodules if the right flags are sent
Change-Id: I227e011043a2242db29288b38b9f6069939635d4
Signed-off-by: Ed Tanous <ed.tanous@intel.com>
| -rw-r--r-- | CMakeLists.txt | 16 | ||||
| m--------- | boost-dbus | 0 |
2 files changed, 11 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index db863bbd97..27c4ce9209 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) message(CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}) option(BUILD_STATIC_LIBS "Built static libraries" ON) - +option(YOCTO_DEPENDENCIES "Use YOCTO depedencies system" OFF) option(HUNTER_ENABLED "Enable hunter package pulling" OFF) include("cmake/HunterGate.cmake") @@ -78,8 +78,11 @@ find_package(ZLIB REQUIRED) include_directories(${ZLIB_INCLUDE_DIRS}) #tinyxml2 -add_subdirectory(tinyxml2) - +if(NOT ${YOCTO_DEPENDENCIES}) + add_subdirectory(tinyxml2) +else() + find_package(tinyxml2 REQUIRED) +endif() # PAM option(WEBSERVER_ENABLE_PAM "enable pam authentication" ON) if ("${WEBSERVER_ENABLE_PAM}") @@ -91,8 +94,11 @@ endif() # Boost-dbus set(BOOST_DBUS_BUILD_UT ${BMCWEB_BUILD_UT}) -add_subdirectory(boost-dbus) - +if(NOT ${YOCTO_DEPENDENCIES}) + add_subdirectory(boost-dbus) +else() + find_package(boost-dbus REQUIRED) +endif() set(WEBSERVER_MAIN src/webserver_main.cpp) # the webassets file has a non-ideal beahvior, where it loads binary data into a std::string diff --git a/boost-dbus b/boost-dbus -Subproject f95fe4cc8caaa50c344594b96211655d5dba09a +Subproject e7dae9ce93226e6a7bf3d9101f457d29afac40c |