From c7b3f29f6202c50ff1dd83d5508556c7ef010aba Mon Sep 17 00:00:00 2001
From: Sara Dickinson <sara@sinodun.com>
Date: Wed, 21 Jun 2023 11:26:42 +0100
Subject: [PATCH] Test reverting FindLibevent2

---
 cmake/modules/FindLibevent2.cmake | 86 +++++++++++++------------------
 1 file changed, 35 insertions(+), 51 deletions(-)

diff --git a/cmake/modules/FindLibevent2.cmake b/cmake/modules/FindLibevent2.cmake
index b84dfa59..56a1fa01 100644
--- a/cmake/modules/FindLibevent2.cmake
+++ b/cmake/modules/FindLibevent2.cmake
@@ -1,22 +1,15 @@
 #[=======================================================================[.rst:
 FindLibevent2
 -------------
-
 Find the Libevent2 library. For now this finds the core library only.
-
 Imported targets
 ^^^^^^^^^^^^^^^^
-
 This module defines the following :prop_tgt:`IMPORTED` targets:
-
 ``Libevent2::Libevent_core``
   The Libevent2 library, if found.
-
 Result variables
 ^^^^^^^^^^^^^^^^
-
 This module will set the following variables in your project:
-
 ``Libevent2_FOUND``
   If false, do not try to use Libevent2.
 ``LIBEVENT2_INCLUDE_DIR``
@@ -28,51 +21,42 @@ This module will set the following variables in your project:
 
 #]=======================================================================]
 
-find_package(PkgConfig QUIET)
-if (PKG_CONFIG_FOUND)
-    pkg_check_modules(PkgLibevent IMPORTED_TARGET GLOBAL QUIET libevent>=2)
-endif ()
+find_path(LIBEVENT2_INCLUDE_DIR event2/event.h
+  HINTS
+  "${LIBEVENT2_DIR}"
+  "${LIBEVENT2_DIR}/include"
+)
 
-if (PkgLibevent_FOUND)
-  set(LIBEVENT2_INCLUDE_DIR ${PkgLibevent_INCLUDE_DIRS} CACHE FILEPATH "libevent2 include path")
-  set(LIBEVENT2_LIBRARIES ${PkgLibevent_LIBRARIES} CACHE STRING "libevent2 libraries")
-  set(LIBEVENT2_VERSION ${PkgLibevent_VERSION})
-  add_library(Libevent2::Libevent_core ALIAS PkgConfig::PkgLibevent)
-  set(Libevent2_FOUND ON)
-else ()
-  find_path(LIBEVENT2_INCLUDE_DIR event2/event.h
-    HINTS
-    "${LIBEVENT2_DIR}"
-    "${LIBEVENT2_DIR}/include"
-  )
-  
-  find_library(LIBEVENT2_LIBRARIES NAMES event_core libevent_core
-    HINTS
-    "${LIBEVENT2_DIR}"
-    "${LIBEVENT2_DIR}/lib"
-  )
-  
-  if (LIBEVENT2_INCLUDE_DIR AND LIBEVENT2_LIBRARIES)
-    if (NOT TARGET Libevent2::Libevent_core)
-      add_library(Libevent2::Libevent_core UNKNOWN IMPORTED)
-      set_target_properties(Libevent2::Libevent_core PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES "${LIBEVENT2_INCLUDE_DIR}"
-        IMPORTED_LINK_INTERFACE_LANGUAGES "C"
-        IMPORTED_LOCATION "${LIBEVENT2_LIBRARIES}"
-        )
-    endif ()
-  
-    if (NOT LIBEVENT2_VERSION AND LIBEVENT2_INCLUDE_DIR AND EXISTS "${LIBEVENT2_INCLUDE_DIR}/event2/event.h")
-      file(STRINGS "${LIBEVENT2_INCLUDE_DIR}/event2/event-config.h" LIBEVENT2_H REGEX "^#define _?EVENT_+VERSION ")
-      string(REGEX REPLACE "^.*EVENT_+VERSION \"([^\"]+)\".*$" "\\1" LIBEVENT2_VERSION "${LIBEVENT2_H}")
-    endif ()
+find_library(LIBEVENT2_LIBRARY NAMES event_core libevent_core
+  HINTS
+  "${LIBEVENT2_DIR}"
+  "${LIBEVENT2_DIR}/lib"
+)
+
+set(LIBEVENT2_LIBRARIES "")
+
+if (LIBEVENT2_INCLUDE_DIR AND LIBEVENT2_LIBRARY)
+  if (NOT TARGET Libevent2::Libevent_core)
+    add_library(Libevent2::Libevent_core UNKNOWN IMPORTED)
+    set_target_properties(Libevent2::Libevent_core PROPERTIES
+      INTERFACE_INCLUDE_DIRECTORIES "${LIBEVENT2_INCLUDE_DIR}"
+      IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+      IMPORTED_LOCATION "${LIBEVENT2_LIBRARY}"
+      )
   endif ()
 
-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(Libevent2
-    REQUIRED_VARS LIBEVENT2_LIBRARIES LIBEVENT2_INCLUDE_DIR
-    VERSION_VAR LIBEVENT2_VERSION
-  )
-endif ()
+  if (NOT LIBEVENT2_VERSION AND LIBEVENT2_INCLUDE_DIR AND EXISTS "${LIBEVENT2_INCLUDE_DIR}/event2/event.h")
+    file(STRINGS "${LIBEVENT2_INCLUDE_DIR}/event2/event-config.h" LIBEVENT2_H REGEX "^#define _?EVENT_+VERSION ")
+    string(REGEX REPLACE "^.*EVENT_+VERSION \"([^\"]+)\".*$" "\\1" LIBEVENT2_VERSION "${LIBEVENT2_H}")
+  endif ()
+endif()
 
-mark_as_advanced(LIBEVENT2_INCLUDE_DIR LIBEVENT2_LIBRARIES)
+list(APPEND LIBEVENT2_LIBRARIES "${LIBEVENT2_LIBRARY}")
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Libevent2
+  REQUIRED_VARS LIBEVENT2_LIBRARIES LIBEVENT2_INCLUDE_DIR
+  VERSION_VAR LIBEVENT2_VERSION
+  )
+
+mark_as_advanced(LIBEVENT2_INCLUDE_DIR LIBEVENT2_LIBRARIES LIBEVENT2_LIBRARY)
\ No newline at end of file