diff options
| author |   Jordan Augé <jordan.auge+fdio@cisco.com> | 2019-12-12 12:42:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2019-12-12 12:42:29 +0000 |
| commit | 1118a7cbd7ddb06e9a96e945ba3cb618560bdcaa (patch) | |
| tree | d0ce4af72fda2fc18b7c74b8d086049ed3f9c2c3 | |
| parent | d4f976ac3a063f7ebc8e55584c98502ce9a3dc3f (diff) | |
| parent | dbc9bfe3dfeb07be62e6a3a440d570ccad45f428 (diff) | |
Merge "[HICN-450] Build hicn-light-control executable for android."
| -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} +) |