summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorMauro Sardara <msardara@cisco.com>2019-02-01 17:12:38 +0100
committerMauro Sardara <msardara@cisco.com>2019-02-01 18:41:39 +0100
commite8fabe3f6313a3b9050fe16458e4714d9dce426e (patch)
treeb379acde21e48a0f2e047d47f79ea30e8d43bd80 /cmake
parentc00bc6fc2af9a54fe339f8d6a3ec1ab889c2931e (diff)
[HICN-10] Compile libtransport with libmemif support
Change-Id: I81d1cb4d5f16a61c35f66fe347985f05d8c97383 Signed-off-by: Mauro Sardara <msardara@cisco.com>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/Modules/FindLibtransport.cmake3
-rw-r--r--cmake/Modules/Packager.cmake4
2 files changed, 4 insertions, 3 deletions
diff --git a/cmake/Modules/FindLibtransport.cmake b/cmake/Modules/FindLibtransport.cmake
index 5910a64da..8a650b98c 100644
--- a/cmake/Modules/FindLibtransport.cmake
+++ b/cmake/Modules/FindLibtransport.cmake
@@ -35,7 +35,8 @@ find_path(LIBTRANSPORT_INCLUDE_DIR hicn/transport/config.h
DOC "Find the libtransport includes"
)
-find_library(LIBTRANSPORT_LIBRARY NAMES transport
+find_library(LIBTRANSPORT_LIBRARY
+ NAMES hicntransport hicntransport-memif
HINTS ${LIBTRANSPORT_SEARCH_PATH_LIST}
PATH_SUFFIXES lib
DOC "Find the libtransport libraries"
diff --git a/cmake/Modules/Packager.cmake b/cmake/Modules/Packager.cmake
index 15b5951fa..b19145025 100644
--- a/cmake/Modules/Packager.cmake
+++ b/cmake/Modules/Packager.cmake
@@ -82,7 +82,7 @@ macro(make_packages)
set(CPACK_PACKAGE_VERSION "${deb_ver}")
foreach(lc ${components})
- if (${lc} MATCHES "Unspecified.*")
+ if (${lc} MATCHES ".*Unspecified.*")
continue()
endif()
@@ -110,7 +110,7 @@ macro(make_packages)
set(CPACK_PACKAGE_VERSION "${rpm_ver}")
foreach(lc ${components})
- if (${lc} MATCHES "Unspecified.*")
+ if (${lc} MATCHES ".*Unspecified.*")
continue()
endif()