diff options
| author |   Mauro Sardara <msardara@cisco.com> | 2020-09-18 17:39:03 +0200 |
|---|---|---|
| committer | Mauro Sardara <msardara@cisco.com> | 2020-09-18 17:41:14 +0200 |
| commit | 20a773677230374ffa2d5d140f7d46032fb7bc9d (patch) | |
| tree | 972ba743c7b1cfbbabd38024215af670d4dc2e3c /ctrl | |
| parent | 22738e6177e9e1348e5a9c23c5a71e1d1ef7246f (diff) | |
Revert to [HICN-638] Check if systemd is running before enabling hicn-light service
Signed-off-by: Mauro Sardara <msardara@cisco.com>
Change-Id: I1810d96e001a4e6e097e1efa331b682af750925d
Diffstat (limited to 'ctrl')
| -rw-r--r-- | ctrl/facemgr/src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ctrl/libhicnctrl/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ctrl/libhicnctrl/src/CMakeLists.txt | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ctrl/facemgr/src/CMakeLists.txt b/ctrl/facemgr/src/CMakeLists.txt index 6a8ae36e5..4bcad475d 100644 --- a/ctrl/facemgr/src/CMakeLists.txt +++ b/ctrl/facemgr/src/CMakeLists.txt @@ -106,7 +106,7 @@ if (DISABLE_SHARED_LIBRARIES) LINK_LIBRARIES ${LIBRARIES} COMPONENT ${FACEMGR} INCLUDE_DIRS ${INCLUDE_DIRS} - HEADER_ROOT_DIR hicn + INSTALL_ROOT_DIR hicn DEFINITIONS ${COMPILER_DEFINITIONS} ) else () @@ -118,7 +118,7 @@ else () LINK_LIBRARIES ${LIBRARIES} COMPONENT ${FACEMGR} INCLUDE_DIRS ${INCLUDE_DIRS} - HEADER_ROOT_DIR hicn + INSTALL_ROOT_DIR hicn DEFINITIONS ${COMPILER_DEFINITIONS} ) endif () diff --git a/ctrl/libhicnctrl/CMakeLists.txt b/ctrl/libhicnctrl/CMakeLists.txt index 2ae5dac97..b2c5975be 100644 --- a/ctrl/libhicnctrl/CMakeLists.txt +++ b/ctrl/libhicnctrl/CMakeLists.txt @@ -81,7 +81,7 @@ else() ) list(APPEND DEPENDENCIES - hicn_plugin.shared + hicn_plugin ${SAFE_VAPI_SHARED} ) else () diff --git a/ctrl/libhicnctrl/src/CMakeLists.txt b/ctrl/libhicnctrl/src/CMakeLists.txt index f5d3c49a3..00661a2a0 100644 --- a/ctrl/libhicnctrl/src/CMakeLists.txt +++ b/ctrl/libhicnctrl/src/CMakeLists.txt @@ -69,7 +69,7 @@ build_library(${LIBHICNCTRL} DEPENDS ${DEPENDENCIES} COMPONENT ${LIBHICNCTRL_COMPONENT} INCLUDE_DIRS ${INCLUDE_DIRS} - HEADER_ROOT_DIR hicn + INSTALL_ROOT_DIR hicn DEFINITIONS ${COMPILER_DEFINITIONS} ) |