From 211b6a8bc6d959a874a43f28d4cda43eae48200d Mon Sep 17 00:00:00 2001 From: Mauro Sardara Date: Tue, 22 Jan 2019 00:02:05 +0100 Subject: [HICN-3] First version of packaging system based on cmake. Change-Id: I576f84f4c12f932e17e9169f2c6ffdaed128ca10 Signed-off-by: Mauro Sardara --- libtransport/CMakeLists.txt | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'libtransport/CMakeLists.txt') diff --git a/libtransport/CMakeLists.txt b/libtransport/CMakeLists.txt index f2ade4520..097ab03ab 100755 --- a/libtransport/CMakeLists.txt +++ b/libtransport/CMakeLists.txt @@ -22,7 +22,6 @@ set(CMAKE_MODULE_PATH ) include(DefaultConfiguration) -include(Packager) include(BuildMacros) if (NOT CMAKE_BUILD_TYPE) @@ -69,7 +68,7 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) if (__vpp__) find_package_wrapper(HicnBinaryApi REQUIRED) endif() - set(LIBTRANSPORT transport) + set(LIBTRANSPORT hicntransport) else() set(HICN_LIBRARIES ${LIBHICN_SHARED}) list(APPEND DEPENDENCIES @@ -84,6 +83,8 @@ else() endif() endif() +include(Packaging) + find_package(Threads REQUIRED) if (${COMPILE_TESTS}) @@ -112,11 +113,4 @@ list(APPEND LIBTRANSPORT_INCLUDE_DIRS ${ASIO_INCLUDE_DIRS} ) -add_subdirectory(${TRANSPORT_ROOT_PATH}) - -# Packaging -add_package(libtransport - NAME "libtransport" - # DEPENDENCIES "fd.io" FIXME - DESCRIPTION "Shared Memory Interface" -) +add_subdirectory(${TRANSPORT_ROOT_PATH}) \ No newline at end of file -- cgit 1.2.3-korg