aboutsummaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
Diffstat (limited to 'utils')
-rw-r--r--utils/CMakeLists.txt7
-rw-r--r--utils/src/ping_client.cc2
2 files changed, 8 insertions, 1 deletions
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index b1993e740..c78110949 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -29,7 +29,12 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
find_package(Libtransport REQUIRED)
set(HICN_UTILS hicn-utils)
else()
- set(LIBTRANSPORT_LIBRARIES ${LIBTRANSPORT_SHARED})
+ if (ANDROID_API)
+ set(LIBTRANSPORT_LIBRARIES ${LIBTRANSPORT})
+ else ()
+ set(LIBTRANSPORT_LIBRARIES ${LIBTRANSPORT_SHARED})
+ endif ()
+
endif()
set(SUFFIX "")
diff --git a/utils/src/ping_client.cc b/utils/src/ping_client.cc
index d72177830..f88bc7eec 100644
--- a/utils/src/ping_client.cc
+++ b/utils/src/ping_client.cc
@@ -18,8 +18,10 @@
// Let's make the linker happy
#if !TRANSPORT_LOG_EXTERN_GLOBAL_OUTPUT_LEVEL
+#ifndef TRANSPORT_LOG_DEFINE_GLOBAL_OUTPUT_LEVEL
TRANSPORT_LOG_DEFINE_GLOBAL_OUTPUT_LEVEL = 0;
#endif
+#endif
#include <asio/steady_timer.hpp>
#include <chrono>