diff options
| author |   Mauro Sardara <msardara@cisco.com> | 2019-12-12 11:46:59 +0100 |
|---|---|---|
| committer | Mauro Sardara <msardara@cisco.com> | 2019-12-12 11:46:59 +0100 |
| commit | dbc9bfe3dfeb07be62e6a3a440d570ccad45f428 (patch) | |
| tree | 8196d3972eed8a6d9090e5cd2811c57bb073c771 /hicn-light | |
| parent | abc8c3c68b45567b4bbc2c851a944b778e79331c (diff) | |
[HICN-450] Build hicn-light-control executable for android.
Change-Id: I222132401e225af63f2993b1794120e63d473cfe
Signed-off-by: Mauro Sardara <msardara@cisco.com>
Diffstat (limited to 'hicn-light')
| -rw-r--r-- | hicn-light/src/hicn/CMakeLists.txt | 46 |
1 files changed, 20 insertions, 26 deletions
diff --git a/hicn-light/src/hicn/CMakeLists.txt b/hicn-light/src/hicn/CMakeLists.txt index 64b0ff2a0..3b4ead33f 100644 --- a/hicn-light/src/hicn/CMakeLists.txt +++ b/hicn-light/src/hicn/CMakeLists.txt @@ -16,7 +16,9 @@ list(APPEND COMPILER_DEFINITIONS if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Android" AND NOT COMPILE_FOR_IOS) add_subdirectory(command_line) -endif () +else () + add_subdirectory(command_line/controller) +endif() add_subdirectory(config) add_subdirectory(content_store) @@ -42,29 +44,21 @@ list(APPEND TO_INSTALL_HEADER_FILES ${CMAKE_CURRENT_BINARY_DIR}/hicn-light/config.h ) -if (${CMAKE_SYSTEM_NAME} STREQUAL "Android") - build_library(${LIBHICN_LIGHT} - STATIC - SOURCES ${SOURCE_FILES} - INSTALL_HEADERS ${TO_INSTALL_HEADER_FILES} - LINK_LIBRARIES ${LIBRARIES} - DEPENDS ${DEPENDENCIES} - COMPONENT ${HICN_LIGHT} - INCLUDE_DIRS ${HICN_LIGHT_INCLUDE_DIRS} - INSTALL_ROOT_DIR hicn - DEFINITIONS ${COMPILER_DEFINITIONS} - ) -else () - build_library(${LIBHICN_LIGHT} - STATIC NO_DEV - SOURCES ${SOURCE_FILES} - INSTALL_HEADERS ${TO_INSTALL_HEADER_FILES} - LINK_LIBRARIES ${LIBRARIES} - DEPENDS ${DEPENDENCIES} - COMPONENT ${HICN_LIGHT} - INCLUDE_DIRS ${HICN_LIGHT_INCLUDE_DIRS} - INSTALL_ROOT_DIR hicn - DEFINITIONS ${COMPILER_DEFINITIONS} - ) -endif () +if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Android") + set(LIB_BUILD_TYPE "NO_DEV") +else() + set(LIB_BUILD_TYPE "") +endif() + +build_library(${LIBHICN_LIGHT} + STATIC ${LIB_BUILD_TYPE} + SOURCES ${SOURCE_FILES} + INSTALL_HEADERS ${TO_INSTALL_HEADER_FILES} + LINK_LIBRARIES ${LIBRARIES} + DEPENDS ${DEPENDENCIES} + COMPONENT ${HICN_LIGHT} + INCLUDE_DIRS ${HICN_LIGHT_INCLUDE_DIRS} + INSTALL_ROOT_DIR hicn + DEFINITIONS ${COMPILER_DEFINITIONS} +) |