diff options
| author |   Alberto Compagno <acompagn+fdio@cisco.com> | 2019-10-02 13:01:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2019-10-02 13:01:17 +0000 |
| commit | 761379dc69b5d95e49cd41e828d683c0bd3dd89d (patch) | |
| tree | e4de46aeb986adedddd00dd9468fa4d23c1e95bd | |
| parent | 2db5743133aaec8e7a1fd4f8a9ba6fdf77f9bc9a (diff) | |
| parent | 2fd26546a3ca4440a64c1b16604356fc938487e3 (diff) | |
Merge "[HICN-286] Link libmemif with libhicntransport when libmemif found in the system."
| -rw-r--r-- | extras/libmemif/CMakeLists1.patch | 7 | ||||
| -rw-r--r-- | extras/libmemif/cmake/Modules/Packaging.cmake | 15 | ||||
| -rw-r--r-- | libtransport/CMakeLists.txt | 8 |
3 files changed, 26 insertions, 4 deletions
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." +) diff --git a/libtransport/CMakeLists.txt b/libtransport/CMakeLists.txt index 68e9efe77..e68e45c40 100644 --- a/libtransport/CMakeLists.txt +++ b/libtransport/CMakeLists.txt @@ -105,11 +105,11 @@ else() list(APPEND DEPENDENCIES ${LIBMEMIF_SHARED} ) - - list(APPEND LIBRARIES - ${LIBMEMIF_SHARED} - ) endif() + + list(APPEND LIBRARIES + ${LIBMEMIF_LIBRARIES} + ) endif() endif() endif() |