From 05ca0aa8f612ee48fb66d4dbebe596b7f1e03181 Mon Sep 17 00:00:00 2001 From: Mauro Sardara Date: Fri, 26 Jul 2019 17:32:48 +0200 Subject: [HICN-253] Mark cmake target for library as static or shared. Change-Id: I1e8a14f9255f04bddbb87f74a6d6163a02dedb22 Signed-off-by: Mauro Sardara --- utils/CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'utils') diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 2f7b3bb12..ad81427e7 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -35,9 +35,11 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) set(HICN_UTILS hicn-utils) else() if (ANDROID_API) - set(LIBTRANSPORT_LIBRARIES ${LIBTRANSPORT}) + set(LIBTRANSPORT_LIBRARIES ${LIBTRANSPORT_STATIC}) + set(DEPENDENCIES ${LIBTRANSPORT_STATIC}) else () set(LIBTRANSPORT_LIBRARIES ${LIBTRANSPORT_SHARED}) + set(DEPENDENCIES ${LIBTRANSPORT_SHARED}) endif () endif() @@ -60,7 +62,7 @@ include(Packaging) build_executable(hiperf SOURCES src/hiperf.cc LINK_LIBRARIES ${LIBTRANSPORT_LIBRARIES} ${WSOCK32_LIBRARY} ${WS2_32_LIBRARY} - DEPENDS ${LIBTRANSPORT} + DEPENDS ${DEPENDENCIES} COMPONENT ${HICN_UTILS} DEFINITIONS ${COMPILER_DEFINITIONS} ) @@ -68,7 +70,7 @@ build_executable(hiperf build_executable(hicn-ping-server SOURCES src/ping_server.cc LINK_LIBRARIES ${LIBTRANSPORT_LIBRARIES} ${WSOCK32_LIBRARY} ${WS2_32_LIBRARY} - DEPENDS ${LIBTRANSPORT} + DEPENDS ${DEPENDENCIES} COMPONENT ${HICN_UTILS} DEFINITIONS ${COMPILER_DEFINITIONS} ) @@ -76,7 +78,7 @@ build_executable(hicn-ping-server build_executable(hicn-ping-client SOURCES src/ping_client.cc LINK_LIBRARIES ${LIBTRANSPORT_LIBRARIES} ${WSOCK32_LIBRARY} ${WS2_32_LIBRARY} - DEPENDS ${LIBTRANSPORT} + DEPENDS ${DEPENDENCIES} COMPONENT ${HICN_UTILS} DEFINITIONS ${COMPILER_DEFINITIONS} ) -- cgit 1.2.3-korg