aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/CMakeLists.txt18
-rw-r--r--apps/http-server/CMakeLists.txt3
2 files changed, 16 insertions, 5 deletions
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
index 5fed15380..f2a950a6d 100644
--- a/apps/CMakeLists.txt
+++ b/apps/CMakeLists.txt
@@ -30,10 +30,19 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
include_directories(${LIBTRANSPORT_INCLUDE_DIRS})
set(HICN_APPS hicn-apps)
else()
- set(LIBTRANSPORT_LIBRARIES ${LIBTRANSPORT_SHARED})
- list(APPEND DEPENDENCIES
- ${LIBTRANSPORT_LIBRARIES}
- )
+ if (ANDROID_API)
+ find_package(OpenSSL REQUIRED)
+ find_package(ZLIB REQUIRED)
+ set(LIBTRANSPORT_LIBRARIES ${LIBTRANSPORT})
+ list(APPEND DEPENDENCIES
+ ${LIBTRANSPORT_LIBRARIES}
+ )
+ else ()
+ set(LIBTRANSPORT_LIBRARIES ${LIBTRANSPORT_SHARED})
+ list(APPEND DEPENDENCIES
+ ${LIBTRANSPORT_LIBRARIES}
+ )
+ endif ()
endif()
set(SUFFIX "")
@@ -45,6 +54,7 @@ set(HICN_APPS "${HICN_APPS}${SUFFIX}")
list(APPEND LIBRARIES
${LIBTRANSPORT_LIBRARIES}
+ ${OPENSSL_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
)
diff --git a/apps/http-server/CMakeLists.txt b/apps/http-server/CMakeLists.txt
index a39cb8366..743176136 100644
--- a/apps/http-server/CMakeLists.txt
+++ b/apps/http-server/CMakeLists.txt
@@ -67,6 +67,7 @@ include_directories(
http-client
)
+
set(LIBHTTP_SERVER hicnhttpserver)
build_library(${LIBHTTP_SERVER}
@@ -80,7 +81,7 @@ build_library(${LIBHTTP_SERVER}
build_executable(${HTTP_SERVER}
SOURCES ${APP_SOURCE_FILES}
- LINK_LIBRARIES ${LIBHTTP_SERVER} ${WSOCK32_LIBRARY} ${WS2_32_LIBRARY}
+ LINK_LIBRARIES ${LIBHTTP_SERVER} ${LIBRARIES} ${ZLIB_LIBRARIES} ${WSOCK32_LIBRARY} ${WS2_32_LIBRARY}
DEPENDS ${LIBHTTP_SERVER}
COMPONENT ${HICN_APPS}
DEFINITIONS ${COMPILER_DEFINITIONS}