diff options
| author |   Mauro Sardara <msardara@cisco.com> | 2019-05-16 15:46:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2019-05-16 15:46:10 +0000 |
| commit | 41ed041613107ae6f1bf9cae5147cfdc71a1ba54 (patch) | |
| tree | c67e8bcd830e348c0a905fe52d48a248c0031132 /libtransport | |
| parent | db8d063677b42c0ec8191728e55d1d5efef80822 (diff) | |
| parent | 5c9b2cd16e76b7d731bd31422b4a555dbeff1541 (diff) | |
Merge "[HICN-195] Generate static libs for android"
Diffstat (limited to 'libtransport')
| -rw-r--r-- | libtransport/CMakeLists.txt | 19 | ||||
| -rw-r--r-- | libtransport/src/hicn/transport/CMakeLists.txt | 37 |
2 files changed, 38 insertions, 18 deletions
diff --git a/libtransport/CMakeLists.txt b/libtransport/CMakeLists.txt index 757521574..d70a837b9 100644 --- a/libtransport/CMakeLists.txt +++ b/libtransport/CMakeLists.txt @@ -82,11 +82,18 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) endif() set(LIBTRANSPORT hicntransport) else() - set(HICN_LIBRARIES ${LIBHICN_SHARED}) - list(APPEND DEPENDENCIES - ${LIBHICN} - ${LIBHICN_SHARED} - ) + if (ANDROID_API) + set(HICN_LIBRARIES ${LIBHICN}) + list(APPEND DEPENDENCIES + ${LIBHICN} + ) + else () + set(HICN_LIBRARIES ${LIBHICN_SHARED}) + list(APPEND DEPENDENCIES + ${LIBHICN} + ${LIBHICN_SHARED} + ) + endif () if (__vpp__) list(APPEND DEPENDENCIES @@ -108,7 +115,7 @@ if (${COMPILE_TESTS}) endif() if(ANDROID_API) -find_package(OpenSSL REQUIRED) + find_package(OpenSSL REQUIRED) endif () list(APPEND LIBRARIES diff --git a/libtransport/src/hicn/transport/CMakeLists.txt b/libtransport/src/hicn/transport/CMakeLists.txt index 4c0982c58..b6be3f77a 100644 --- a/libtransport/src/hicn/transport/CMakeLists.txt +++ b/libtransport/src/hicn/transport/CMakeLists.txt @@ -48,18 +48,31 @@ endif () if (ANDROID_API) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -isystem -lm") endif() - -build_library(${LIBTRANSPORT} - STATIC SHARED - SOURCES ${SOURCE_FILES} ${HEADER_FILES} - INSTALL_HEADERS ${HEADER_FILES} - LINK_LIBRARIES ${LIBRARIES} - DEPENDS ${DEPENDENCIES} - COMPONENT lib${LIBTRANSPORT} - INCLUDE_DIRS ${LIBTRANSPORT_INCLUDE_DIRS} - INSTALL_ROOT_DIR hicn/transport - DEFINITIONS ${COMPILER_DEFINITIONS} -) +if (ANDROID_API) + build_library(${LIBTRANSPORT} + STATIC + SOURCES ${SOURCE_FILES} ${HEADER_FILES} + INSTALL_HEADERS ${HEADER_FILES} + LINK_LIBRARIES ${LIBRARIES} + DEPENDS ${DEPENDENCIES} + COMPONENT lib${LIBTRANSPORT} + INCLUDE_DIRS ${LIBTRANSPORT_INCLUDE_DIRS} + INSTALL_ROOT_DIR hicn/transport + DEFINITIONS ${COMPILER_DEFINITIONS} + ) +else () + build_library(${LIBTRANSPORT} + STATIC SHARED + SOURCES ${SOURCE_FILES} ${HEADER_FILES} + INSTALL_HEADERS ${HEADER_FILES} + LINK_LIBRARIES ${LIBRARIES} + DEPENDS ${DEPENDENCIES} + COMPONENT lib${LIBTRANSPORT} + INCLUDE_DIRS ${LIBTRANSPORT_INCLUDE_DIRS} + INSTALL_ROOT_DIR hicn/transport + DEFINITIONS ${COMPILER_DEFINITIONS} + ) +endif () if (${COMPILE_TESTS}) add_subdirectory(core/test) |