summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Sardara <msardara@cisco.com>2019-10-02 18:14:34 +0200
committerMauro Sardara <msardara@cisco.com>2019-10-02 18:14:34 +0200
commit523f12c368a3067527546efae5922150281ac203 (patch)
treec4ba638403b54cf5e8cc3e03570769f33311ffc2
parent761379dc69b5d95e49cd41e828d683c0bd3dd89d (diff)
[HICN-290] Added check if ASIO_STANDALONE already defined. Removed openssl find performed by hicn-light.
Change-Id: Ic1d3fe123b099e63a37bcb0c03e00a7c81f509f1 Signed-off-by: Mauro Sardara <msardara@cisco.com>
-rw-r--r--hicn-light/CMakeLists.txt1
-rw-r--r--libtransport/src/hicn/transport/config.h.in3
2 files changed, 3 insertions, 1 deletions
diff --git a/hicn-light/CMakeLists.txt b/hicn-light/CMakeLists.txt
index 9edb146e4..39fce8c1f 100644
--- a/hicn-light/CMakeLists.txt
+++ b/hicn-light/CMakeLists.txt
@@ -74,7 +74,6 @@ endif()
include( Packaging )
find_package(Threads REQUIRED)
-find_package(OpenSSL REQUIRED)
set(LIBHICN_LIGHT hicn-light)
set(LIBHICN_LIGHT_STATIC ${LIBHICN_LIGHT}.static)
diff --git a/libtransport/src/hicn/transport/config.h.in b/libtransport/src/hicn/transport/config.h.in
index 02dcfa0f3..7d47c2b3f 100644
--- a/libtransport/src/hicn/transport/config.h.in
+++ b/libtransport/src/hicn/transport/config.h.in
@@ -16,7 +16,10 @@
#pragma once
#cmakedefine TRANSPORT_HAVE_PTHREAD 1
+
+#ifndef ASIO_STANDALONE
#cmakedefine ASIO_STANDALONE
+#endif
#define RAAQM_CONFIG_PATH "@raaqm_config_path@"