diff options
author | Luca Muscariello <lumuscar+fdio@cisco.com> | 2019-01-22 17:50:52 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@fd.io> | 2019-01-22 17:50:52 +0000 |
commit | bed18df840364847e378d1ce2dea2fbace029720 (patch) | |
tree | d0cd5b86ba9c159f9e8a32331a82e121bafdb4c5 /libtransport/CMakeLists.txt | |
parent | 471bcdc47dce89394a724e96f7c4bd6f242b6a31 (diff) | |
parent | 211b6a8bc6d959a874a43f28d4cda43eae48200d (diff) |
Merge "[HICN-3] First version of packaging system based on cmake."
Diffstat (limited to 'libtransport/CMakeLists.txt')
-rwxr-xr-x | libtransport/CMakeLists.txt | 14 |
1 files changed, 4 insertions, 10 deletions
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 |