diff options
| author |   Mauro Sardara <msardara@cisco.com> | 2019-07-26 17:32:48 +0200 |
|---|---|---|
| committer | Mauro Sardara <msardara@cisco.com> | 2019-07-26 18:08:58 +0200 |
| commit | 05ca0aa8f612ee48fb66d4dbebe596b7f1e03181 (patch) | |
| tree | 613d0c2362fdb62df42ce54aae12362ff0d7d2ec /apps | |
| parent | 7ceadff88f62665194deb12ca0926f5dcd6d3f48 (diff) | |
[HICN-253] Mark cmake target for library as static or shared.
Change-Id: I1e8a14f9255f04bddbb87f74a6d6163a02dedb22
Signed-off-by: Mauro Sardara <msardara@cisco.com>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | apps/higet/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | apps/http-proxy/CMakeLists.txt | 5 |
3 files changed, 9 insertions, 10 deletions
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt index f59d58f6e..161555c5b 100644 --- a/apps/CMakeLists.txt +++ b/apps/CMakeLists.txt @@ -34,16 +34,14 @@ else() if (ANDROID_API) find_package(OpenSSL REQUIRED) find_package(ZLIB REQUIRED) - set(LIBTRANSPORT_LIBRARIES ${LIBTRANSPORT}) - list(APPEND DEPENDENCIES - ${LIBTRANSPORT_LIBRARIES} - ) + set(LIBTRANSPORT_LIBRARIES ${LIBTRANSPORT_STATIC}) else () set(LIBTRANSPORT_LIBRARIES ${LIBTRANSPORT_SHARED}) - list(APPEND DEPENDENCIES - ${LIBTRANSPORT_LIBRARIES} - ) endif () + + list(APPEND DEPENDENCIES + ${LIBTRANSPORT_LIBRARIES} + ) endif() set(SUFFIX "") diff --git a/apps/higet/CMakeLists.txt b/apps/higet/CMakeLists.txt index 747760f00..d337f2620 100644 --- a/apps/higet/CMakeLists.txt +++ b/apps/higet/CMakeLists.txt @@ -34,7 +34,7 @@ list(APPEND APPS_SRC build_executable(${HIGET} SOURCES ${APPS_SRC} LINK_LIBRARIES ${LIBTRANSPORT_LIBRARIES} ${WSOCK32_LIBRARY} ${WS2_32_LIBRARY} - DEPENDS ${LIBTRANSPORT} + DEPENDS ${LIBTRANSPORT_LIBRARIES} COMPONENT ${HICN_APPS} DEFINITIONS ${COMPILER_DEFINITIONS} ) diff --git a/apps/http-proxy/CMakeLists.txt b/apps/http-proxy/CMakeLists.txt index b6ee5e010..dea544510 100644 --- a/apps/http-proxy/CMakeLists.txt +++ b/apps/http-proxy/CMakeLists.txt @@ -47,6 +47,7 @@ set(APP_SOURCE_FILES ) set(LIBHTTP_PROXY hicnhttpproxy) +set(LIBHTTP_PROXY_STATIC ${LIBHTTP_PROXY}.static) build_library(${LIBHTTP_PROXY} STATIC @@ -58,8 +59,8 @@ build_library(${LIBHTTP_PROXY} build_executable(${HTTP_PROXY} SOURCES ${APP_SOURCE_FILES} - LINK_LIBRARIES ${LIBHTTP_PROXY} - DEPENDS ${LIBHTTP_PROXY} + LINK_LIBRARIES ${LIBHTTP_PROXY_STATIC} + DEPENDS ${LIBHTTP_PROXY_STATIC} COMPONENT ${HICN_APPS} DEFINITIONS ${COMPILER_DEFINITIONS} )
\ No newline at end of file |