diff options
| author |   Jordan Augé <jordan.auge+fdio@cisco.com> | 2019-11-15 17:06:50 +0100 |
|---|---|---|
| committer | Jordan Augé <jordan.auge+fdio@cisco.com> | 2019-11-15 17:06:50 +0100 |
| commit | 547acf3eed92d3564139cccf205c852178bcc310 (patch) | |
| tree | 4a958ce693715190d0c157614fb61baa2172dfd7 | |
| parent | 56d4ce1db07f32a5804db764f72c3b880ab5f961 (diff) | |
[HICN-386] Improve API error management in libhicnctrl
Change-Id: Ifab987a17255e20077242888b052e312f9e4c964
Signed-off-by: Jordan Augé <jordan.auge+fdio@cisco.com>
| -rw-r--r-- | cmake/Modules/FindLibhicn.cmake | 3 | ||||
| -rw-r--r-- | ctrl/facemgr/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ctrl/libhicnctrl/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ctrl/libhicnctrl/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | hicn-light/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | libtransport/CMakeLists.txt | 2 |
6 files changed, 9 insertions, 6 deletions
diff --git a/cmake/Modules/FindLibhicn.cmake b/cmake/Modules/FindLibhicn.cmake index 7cfaaa5e5..38775be6a 100644 --- a/cmake/Modules/FindLibhicn.cmake +++ b/cmake/Modules/FindLibhicn.cmake @@ -43,6 +43,9 @@ find_library(HICN_LIBRARY NAMES hicn ) set(HICN_LIBRARIES ${HICN_LIBRARY}) +if (${CMAKE_SYSTEM_NAME} STREQUAL "Android") +set(HICN_LIBRARIES ${HICN_LIBRARIES} log) +endif() set(HICN_INCLUDE_DIRS ${HICN_INCLUDE_DIR}) include(FindPackageHandleStandardArgs) diff --git a/ctrl/facemgr/CMakeLists.txt b/ctrl/facemgr/CMakeLists.txt index a560be36a..63a5f3c84 100644 --- a/ctrl/facemgr/CMakeLists.txt +++ b/ctrl/facemgr/CMakeLists.txt @@ -69,7 +69,7 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) set(LIBFACEMGR facemgr) else() if (${CMAKE_SYSTEM_NAME} STREQUAL "Android") - set(HICN_LIBRARIES ${LIBHICN_STATIC}) + set(HICN_LIBRARIES ${LIBHICN_STATIC} log) set(LIBHICNCTRL_LIBRARIES ${LIBHICNCTRL_STATIC}) list(APPEND DEPENDENCIES ${LIBHICN_STATIC} diff --git a/ctrl/libhicnctrl/CMakeLists.txt b/ctrl/libhicnctrl/CMakeLists.txt index 6b67544ee..960eb6743 100644 --- a/ctrl/libhicnctrl/CMakeLists.txt +++ b/ctrl/libhicnctrl/CMakeLists.txt @@ -44,7 +44,7 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) else() if (${CMAKE_SYSTEM_NAME} STREQUAL "Android") - set(HICN_LIBRARIES ${LIBHICN_STATIC}) + set(HICN_LIBRARIES ${LIBHICN_STATIC} log) list(APPEND DEPENDENCIES ${LIBHICN_STATIC} ) diff --git a/ctrl/libhicnctrl/src/CMakeLists.txt b/ctrl/libhicnctrl/src/CMakeLists.txt index b7c295ea7..ea63217dd 100644 --- a/ctrl/libhicnctrl/src/CMakeLists.txt +++ b/ctrl/libhicnctrl/src/CMakeLists.txt @@ -43,7 +43,7 @@ set(INCLUDE_DIRS ) if (${CMAKE_SYSTEM_NAME} STREQUAL "Android") - set(HICN_LIBRARIES ${LIBHICN_STATIC}) + set(HICN_LIBRARIES ${LIBHICN_STATIC} log) build_library(${LIBHICNCTRL} STATIC SOURCES ${SOURCE_FILES} diff --git a/hicn-light/CMakeLists.txt b/hicn-light/CMakeLists.txt index a632380fc..14a7b9710 100644 --- a/hicn-light/CMakeLists.txt +++ b/hicn-light/CMakeLists.txt @@ -59,7 +59,7 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) set(HICN_LIGHT_DAEMON ${HICN_LIGHT}-daemon) else() if (${CMAKE_SYSTEM_NAME} STREQUAL "Android") - set(HICN_LIBRARIES ${LIBHICN_STATIC}) + set(HICN_LIBRARIES ${LIBHICN_STATIC} log) list(APPEND DEPENDENCIES ${LIBHICN_STATIC} ) @@ -113,4 +113,4 @@ include(ServiceScript) install_service_script( ${CMAKE_CURRENT_SOURCE_DIR}/config/hicn-light.service COMPONENT ${HICN_LIGHT} -)
\ No newline at end of file +) diff --git a/libtransport/CMakeLists.txt b/libtransport/CMakeLists.txt index e90d3a2f4..836a524f5 100644 --- a/libtransport/CMakeLists.txt +++ b/libtransport/CMakeLists.txt @@ -86,7 +86,7 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) set(LIBTRANSPORT_STATIC ${LIBTRANSPORT}.static) else() if (${CMAKE_SYSTEM_NAME} STREQUAL "Android") - set(HICN_LIBRARIES ${LIBHICN_STATIC}) + set(HICN_LIBRARIES ${LIBHICN_STATIC} log) list(APPEND DEPENDENCIES ${LIBHICN_STATIC} ) |