summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorMauro Sardara <msardara@cisco.com>2019-12-06 18:25:28 +0100
committerMauro Sardara <msardara@cisco.com>2019-12-10 17:50:49 +0100
commit3f21100e1d2ec47b64670a8b08d0c9d067bf9ef3 (patch)
tree6774ce7f2bc020b646366503eaa6acf2f0af13eb /utils
parente8eda2c819b36555d9d6b080eaf8b4b1109d7646 (diff)
[HICN-430] Rework on CMake
Change way targets are defined: each project defines targets. Fix project BUILD flags Add build-extras bash script Rework build tree of extras folder, using ExternalProject_Add Change-Id: I82fa29896e54c8a033490eba013c3f0431bec9d0 Signed-off-by: Mauro Sardara <msardara@cisco.com>
Diffstat (limited to 'utils')
-rw-r--r--utils/CMakeLists.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 0e5430356..3216582c2 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -30,9 +30,10 @@ endif ()
include(BuildMacros)
include(WindowsMacros)
+set(HICN_UTILS hicn-utils CACHE INTERNAL "" FORCE)
+
if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
find_package(Libtransport REQUIRED)
- set(HICN_UTILS hicn-utils)
else()
if (${CMAKE_SYSTEM_NAME} STREQUAL "Android")
set(LIBTRANSPORT_LIBRARIES ${LIBTRANSPORT_STATIC})
@@ -45,6 +46,7 @@ else()
endif()
set(SUFFIX "")
+message("~~~~~~~~~~~~~~~~~~~~~~> ${LIBTRANSPORT_LIBRARIES}")
if (${LIBTRANSPORT_LIBRARIES} MATCHES ".*-memif.*")
set(SUFFIX "-memif")
set(LINK_FLAGS "-Wl,-unresolved-symbols=ignore-in-shared-libs")