From 40a860c269f033e87fccd7d0e59a274210b51bf4 Mon Sep 17 00:00:00 2001
From: Matthias Maier <tamiko@43-1.org>
Date: Sat, 23 Jul 2022 18:38:02 -0500
Subject: [PATCH 1/2] CMake: remove find_package override

---
 cmake/macros/macro_find_package.cmake | 33 ---------------------------
 1 file changed, 33 deletions(-)
 delete mode 100644 cmake/macros/macro_find_package.cmake

diff --git a/cmake/macros/macro_find_package.cmake b/cmake/macros/macro_find_package.cmake
deleted file mode 100644
index c3c24a4d79c6..000000000000
--- a/cmake/macros/macro_find_package.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-## ---------------------------------------------------------------------
-##
-## Copyright (C) 2013 - 2014 by the deal.II authors
-##
-## This file is part of the deal.II library.
-##
-## The deal.II library is free software; you can use it, redistribute
-## it, and/or modify it under the terms of the GNU Lesser General
-## Public License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-## The full text of the license can be found in the file LICENSE.md at
-## the top level directory of deal.II.
-##
-## ---------------------------------------------------------------------
-
-#
-# A small wrapper around FIND_PACKAGE.
-# We guard the invocation of FIND_PACKAGE(package <...>) by
-# ${package}_FOUND and ${package}_LIBRARIES to allow easy custom overrides
-#
-
-MACRO(FIND_PACKAGE _package_name)
-  STRING(TOUPPER ${_package_name} _package_name_uppercase)
-
-  IF( NOT DEFINED ${_package_name_uppercase}_FOUND AND
-      NOT DEFINED ${_package_name_uppercase}_LIBRARIES )
-    _FIND_PACKAGE (${_package_name} ${ARGN})
-  ELSE()
-    IF(NOT DEFINED ${_package_name_uppercase}_FOUND)
-      SET(${_package_name_uppercase}_FOUND TRUE)
-    ENDIF()
-  ENDIF()
-ENDMACRO()

From 972ca29e3a25bdb4516cdf81f2f30ff974baef13 Mon Sep 17 00:00:00 2001
From: Matthias Maier <tamiko@43-1.org>
Date: Sat, 23 Jul 2022 18:45:14 -0500
Subject: [PATCH 2/2] CMake: use proper FIND_PACKAGE call in python bindings
 setup

---
 contrib/python-bindings/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/python-bindings/CMakeLists.txt b/contrib/python-bindings/CMakeLists.txt
index 50011c11e084..a7397ad2b2b9 100644
--- a/contrib/python-bindings/CMakeLists.txt
+++ b/contrib/python-bindings/CMakeLists.txt
@@ -49,9 +49,9 @@ IF(DEAL_II_COMPONENT_PYTHON_BINDINGS)
   # Make sure FindBoost.cmake from CMake installation is found.
   LIST(REMOVE_ITEM CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/)
   IF(${BOOST_VERSION} VERSION_LESS 1.67)
-    _FIND_PACKAGE(Boost 1.59 COMPONENTS python REQUIRED)
+    FIND_PACKAGE(Boost 1.59 COMPONENTS python REQUIRED)
   ELSE()
-    _FIND_PACKAGE(Boost 1.67 COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR} REQUIRED)
+    FIND_PACKAGE(Boost 1.67 COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR} REQUIRED)
   ENDIF()
   LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/)