diff options
Diffstat (limited to 'cmake/Modules')
| -rw-r--r-- | cmake/Modules/FindLibtransport.cmake | 3 | ||||
| -rw-r--r-- | cmake/Modules/Packager.cmake | 10 |
2 files changed, 11 insertions, 2 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 c04e5c0b0..b19145025 100644 --- a/cmake/Modules/Packager.cmake +++ b/cmake/Modules/Packager.cmake @@ -82,6 +82,10 @@ macro(make_packages) set(CPACK_PACKAGE_VERSION "${deb_ver}") foreach(lc ${components}) + if (${lc} MATCHES ".*Unspecified.*") + continue() + endif() + string(TOUPPER ${lc} uc) set(CPACK_${type}_${uc}_FILE_NAME "${lc}_${deb_ver}_${arch}.deb") @@ -106,6 +110,10 @@ macro(make_packages) set(CPACK_PACKAGE_VERSION "${rpm_ver}") foreach(lc ${components}) + if (${lc} MATCHES ".*Unspecified.*") + continue() + endif() + string(TOUPPER ${lc} uc) set(CPACK_${type}_${uc}_DESCRIPTION "${${lc}_DESCRIPTION}") @@ -138,4 +146,4 @@ macro(make_packages) include(CPack) endif() endif() -endmacro()
\ No newline at end of file +endmacro() |