diff options
| author | James Feist <james.feist@linux.intel.com> | 2018-08-08 14:03:49 -0700 |
|---|---|---|
| committer | James Feist <james.feist@linux.intel.com> | 2018-08-13 18:40:38 +0000 |
| commit | a975e9febfb4ed5838b19ecd608da77e8e2e20f0 (patch) | |
| tree | a782647087ba09b4248db75dfd26e9e7752efe41 /CMakeLists.txt | |
| parent | 797d0c0cfbef8bd8ee4d3ede806ab7fa6ee4420a (diff) | |
| download | bmcweb-a975e9febfb4ed5838b19ecd608da77e8e2e20f0.tar.gz bmcweb-a975e9febfb4ed5838b19ecd608da77e8e2e20f0.zip | |
Make out of tree builds work again
Build sdbusplus and link correctly out of tree.
Closes openbmc/bmcweb#2
Closes openbmc/bmcweb#3
Tested: cmake built out of tree
Change-Id: I7eecb19209a7dace857ffa5eb9498441dfb570e9
Signed-off-by: James Feist <james.feist@linux.intel.com>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a1ecd9..6b8a4ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,20 +109,8 @@ include_directories (${BOOST_SRC_DIR}) # sdbusplus if (NOT ${YOCTO_DEPENDENCIES}) - include_directories ( - ${CMAKE_BINARY_DIR}/sdbusplus-src ${CMAKE_BINARY_DIR}/prefix/include - ) - - set (WANT_TRANSACTION 0) - - configure_file ( - ${CMAKE_BINARY_DIR}/sdbusplus-src/sdbusplus/server.hpp.in - ${CMAKE_BINARY_DIR}/prefix/include/sdbusplus/server.hpp @ONLY - ) - configure_file ( - ${CMAKE_BINARY_DIR}/sdbusplus-src/sdbusplus/bus.hpp.in - ${CMAKE_BINARY_DIR}/prefix/include/sdbusplus/bus.hpp @ONLY - ) + include_directories (${CMAKE_BINARY_DIR}/sdbusplus-src) + link_directories (${CMAKE_BINARY_DIR}/sdbusplus-src/.libs) endif () # Openssl |
