Fix building with cmocka >= 1.1.6

OBS-URL: https://build.opensuse.org/package/show/devel:tools/nss_wrapper?expand=0&rev=42
This commit is contained in:
Andreas Schneider 2023-02-27 08:28:05 +00:00 committed by Git OBS Bridge
parent bfd36e626f
commit 595a011ea0
3 changed files with 38 additions and 0 deletions

View File

@ -0,0 +1,31 @@
From 2c879a0ffa70cee33329291d7576ec971d420da2 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Fri, 17 Feb 2023 17:51:27 +0100
Subject: [PATCH] cmake: Fix cmocka >= 1.1.6 find_package() in CONFIG mode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky@samba.org>
---
tests/CMakeLists.txt | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3b94076..733cc4e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,5 +1,9 @@
project(tests C)
+if (TARGET cmocka::cmocka)
+ set(CMOCKA_LIBRARY cmocka::cmocka)
+endif()
+
set(TESTSUITE_LIBRARIES nss_utils ${NWRAP_REQUIRED_LIBRARIES} ${CMOCKA_LIBRARY})
string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
--
2.39.2

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Feb 27 08:16:39 UTC 2023 - Andreas Schneider <asn@cryptomilk.org>
- Fix building with cmocka >= 1.1.6
* Added socket_wrapper-fix-cmocka-1.1.6+-support.patch
-------------------------------------------------------------------
Wed Jan 25 15:45:26 UTC 2023 - Andreas Schneider <asn@cryptomilk.org>

View File

@ -33,6 +33,7 @@ Source0: https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz
Source1: https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz.asc
Source2: https://cryptomilk.org/gpgkey-8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D.gpg#/%{name}.keyring
Source3: %{name}-rpmlintrc
Patch0: nss_wrapper-fix-cmocka-1.1.6+-support.patch
BuildRequires: cmake
BuildRequires: libcmocka-devel
BuildRequires: netcfg