From 2fd26546a3ca4440a64c1b16604356fc938487e3 Mon Sep 17 00:00:00 2001 From: Mauro Sardara Date: Tue, 1 Oct 2019 18:55:57 +0200 Subject: [HICN-286] Link libmemif with libhicntransport when libmemif found in the system. Added libmemif-dev dependency libmemif. Change-Id: I3fc417da65c1dfc6717c56d92f94a12fc019a9bd Signed-off-by: Mauro Sardara --- extras/libmemif/CMakeLists1.patch | 7 +++++++ extras/libmemif/cmake/Modules/Packaging.cmake | 15 +++++++++++++++ 2 files changed, 22 insertions(+) (limited to 'extras') diff --git a/extras/libmemif/CMakeLists1.patch b/extras/libmemif/CMakeLists1.patch index f699a3ce5..012dc606c 100644 --- a/extras/libmemif/CMakeLists1.patch +++ b/extras/libmemif/CMakeLists1.patch @@ -48,6 +48,7 @@ endif() include_directories(src) set(LIBMEMIF memif) +set(LIBMEMIF_SHARED ${LIBMEMIF}.shared) set(LIBMEMIF_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} @@ -55,4 +56,10 @@ set(LIBMEMIF_INCLUDE_DIRS "" FORCE ) +set(LIBMEMIF_LIBRARIES + ${LIBMEMIF_SHARED} + "" CACHE INTERNAL + "" FORCE +) + add_subdirectory(memif) \ No newline at end of file diff --git a/extras/libmemif/cmake/Modules/Packaging.cmake b/extras/libmemif/cmake/Modules/Packaging.cmake index d6db75a72..50f820589 100644 --- a/extras/libmemif/cmake/Modules/Packaging.cmake +++ b/extras/libmemif/cmake/Modules/Packaging.cmake @@ -27,3 +27,18 @@ set(${LIBMEMIF}_DEB_DEPENDENCIES set(${LIBMEMIF}_RPM_DEPENDENCIES "" CACHE STRING "Dependencies for deb/rpm package." ) + +set(${LIBMEMIF}-dev_DESCRIPTION + "Libmemif, shared memory interface header files" + CACHE STRING "Description for deb/rpm package." +) + +set(${LIBMEMIF}-dev_DEB_DEPENDENCIES + "libmemif (>= stable_version)" + CACHE STRING "Dependencies for deb/rpm package." +) + +set(${LIBMEMIF}-dev_RPM_DEPENDENCIES + "libmemif (>= stable_version)" + CACHE STRING "Dependencies for deb/rpm package." +) -- cgit 1.2.3-korg