diff options
| author |   Jordan Augé <jordan.auge+fdio@cisco.com> | 2020-02-03 10:38:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2020-02-03 10:38:56 +0000 |
| commit | e90a3ec9cbc98d73dfeb2175ee12edfb56af11ee (patch) | |
| tree | 77b833e5189847e84933ce3269aaa05ffda24138 /libtransport | |
| parent | b289a24a07d9fe67e8cd9ea0247987e009df6d50 (diff) | |
| parent | 55f2219ab98b039f256671c5e584a61ab52bfed0 (diff) | |
Merge "[HICN-489] Add iOS support to hicn stack"
Diffstat (limited to 'libtransport')
| -rw-r--r-- | libtransport/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libtransport/src/hicn/transport/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libtransport/CMakeLists.txt b/libtransport/CMakeLists.txt index 6c79c9118..8f70208ab 100644 --- a/libtransport/CMakeLists.txt +++ b/libtransport/CMakeLists.txt @@ -93,7 +93,7 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) find_package_wrapper(Libhicn REQUIRED) else() - if (${CMAKE_SYSTEM_NAME} STREQUAL "Android") + if (DISABLE_SHARED_LIBRARIES) set(HICN_LIBRARIES ${LIBHICN_STATIC} log) list(APPEND DEPENDENCIES ${LIBHICN_STATIC} diff --git a/libtransport/src/hicn/transport/CMakeLists.txt b/libtransport/src/hicn/transport/CMakeLists.txt index 22acdcb7f..4bdb3c1e7 100644 --- a/libtransport/src/hicn/transport/CMakeLists.txt +++ b/libtransport/src/hicn/transport/CMakeLists.txt @@ -60,7 +60,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Android") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -isystem -lm") endif() -if (${CMAKE_SYSTEM_NAME} STREQUAL "Android") +if (DISABLE_SHARED_LIBRARIES) build_library(${LIBTRANSPORT} STATIC SOURCES ${SOURCE_FILES} ${HEADER_FILES} |