You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
108 lines
3.2 KiB
108 lines
3.2 KiB
From 9e7f8ac9ee1f968ac8af2d9c2e9dbd91a3090b73 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Schneider <asn@samba.org>
|
|
Date: Fri, 17 Feb 2023 18:08:45 +0100
|
|
Subject: [PATCH 1/2] cmake: Drop FindCMocka.cmake Module
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
We should use config mode.
|
|
|
|
Signed-off-by: Andreas Schneider <asn@samba.org>
|
|
Reviewed-by: Pavel Filipenský <pfilipensky@samba.org>
|
|
---
|
|
cmake/Modules/FindCMocka.cmake | 49 ----------------------------------
|
|
1 file changed, 49 deletions(-)
|
|
delete mode 100644 cmake/Modules/FindCMocka.cmake
|
|
|
|
diff --git a/cmake/Modules/FindCMocka.cmake b/cmake/Modules/FindCMocka.cmake
|
|
deleted file mode 100644
|
|
index 2dd9fc5..0000000
|
|
--- a/cmake/Modules/FindCMocka.cmake
|
|
+++ /dev/null
|
|
@@ -1,49 +0,0 @@
|
|
-# - Try to find CMocka
|
|
-# Once done this will define
|
|
-#
|
|
-# CMOCKA_ROOT_DIR - Set this variable to the root installation of CMocka
|
|
-#
|
|
-# Read-Only variables:
|
|
-# CMOCKA_FOUND - system has CMocka
|
|
-# CMOCKA_INCLUDE_DIR - the CMocka include directory
|
|
-# CMOCKA_LIBRARIES - Link these to use CMocka
|
|
-# CMOCKA_DEFINITIONS - Compiler switches required for using CMocka
|
|
-#
|
|
-#=============================================================================
|
|
-# Copyright (c) 2011-2012 Andreas Schneider <asn@cryptomilk.org>
|
|
-#
|
|
-# Distributed under the OSI-approved BSD License (the "License");
|
|
-# see accompanying file Copyright.txt for details.
|
|
-#
|
|
-# This software is distributed WITHOUT ANY WARRANTY; without even the
|
|
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
-# See the License for more information.
|
|
-#=============================================================================
|
|
-#
|
|
-
|
|
-find_path(CMOCKA_INCLUDE_DIR
|
|
- NAMES
|
|
- cmocka.h
|
|
- PATHS
|
|
- ${CMOCKA_ROOT_DIR}/include
|
|
-)
|
|
-
|
|
-find_library(CMOCKA_LIBRARY
|
|
- NAMES
|
|
- cmocka
|
|
- PATHS
|
|
- ${CMOCKA_ROOT_DIR}/include
|
|
-)
|
|
-
|
|
-if (CMOCKA_LIBRARY)
|
|
- set(CMOCKA_LIBRARIES
|
|
- ${CMOCKA_LIBRARIES}
|
|
- ${CMOCKA_LIBRARY}
|
|
- )
|
|
-endif (CMOCKA_LIBRARY)
|
|
-
|
|
-include(FindPackageHandleStandardArgs)
|
|
-find_package_handle_standard_args(CMocka DEFAULT_MSG CMOCKA_LIBRARIES CMOCKA_INCLUDE_DIR)
|
|
-
|
|
-# show the CMOCKA_INCLUDE_DIR and CMOCKA_LIBRARIES variables only in the advanced view
|
|
-mark_as_advanced(CMOCKA_INCLUDE_DIR CMOCKA_LIBRARIES)
|
|
--
|
|
2.39.2
|
|
|
|
|
|
From 8e94874bf5c0d569a16985eafa9922d8c527a9fb Mon Sep 17 00:00:00 2001
|
|
From: Andreas Schneider <asn@samba.org>
|
|
Date: Fri, 17 Feb 2023 17:51:27 +0100
|
|
Subject: [PATCH 2/2] 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 9d56f21..26f2da2 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(PAM_MATRIX_PATH "${CMAKE_BINARY_DIR}/src/modules/pam_matrix.so")
|
|
|
|
configure_file(services/matrix.in ${CMAKE_CURRENT_BINARY_DIR}/services/matrix @ONLY)
|
|
--
|
|
2.39.2
|
|
|