From fbcfff380dfedac7e7e464e90ecbefd51a78b217 Mon Sep 17 00:00:00 2001 From: Mauro Sardara Date: Mon, 26 Sep 2022 16:35:46 +0200 Subject: fix(memif.patch): use correct cwd in git describe If libmemif is included as subfolder, it might not find a .git folder in the CMAKE_SOURCE_DIR. To prevent this we need to use CMAKE_CURRENT_SOURCE_DIR, in order to get the folder containing the CMakeLists of libmemif. Ticket: HICN-798 Signed-off-by: Mauro Sardara Change-Id: I51bb5dc94fa79d17482896bca356e60993ea39eb --- libtransport/third-party/memif.patch | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'libtransport') diff --git a/libtransport/third-party/memif.patch b/libtransport/third-party/memif.patch index 0a64513e3..0fb4588bb 100644 --- a/libtransport/third-party/memif.patch +++ b/libtransport/third-party/memif.patch @@ -1,5 +1,5 @@ diff --git a/extras/libmemif/CMakeLists.txt b/extras/libmemif/CMakeLists.txt -index b6b658c2d..28bb8c135 100644 +index b6b658c2d..e5f5ffd9d 100644 --- a/extras/libmemif/CMakeLists.txt +++ b/extras/libmemif/CMakeLists.txt @@ -24,7 +24,7 @@ if (NOT CMAKE_BUILD_TYPE) @@ -11,6 +11,15 @@ index b6b658c2d..28bb8c135 100644 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) set(CMAKE_INSTALL_MESSAGE NEVER) +@@ -59,7 +59,7 @@ endforeach() + # extract version from git + execute_process( + COMMAND git describe --long --match v* +- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ++ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + OUTPUT_VARIABLE VER + OUTPUT_STRIP_TRAILING_WHITESPACE + ) diff --git a/extras/libmemif/src/CMakeLists.txt b/extras/libmemif/src/CMakeLists.txt index ddb8a52f8..b52566e5c 100644 --- a/extras/libmemif/src/CMakeLists.txt -- cgit 1.2.3-korg