Merge remote-tracking branch 'origin/topic/timw/cmake-find-package'

* origin/topic/timw/cmake-find-package: Remove usage of FindRequiredPackage Require CMake 3.15 for consistency with other Zeek projects Update submodules for find_package() fixes
zeek · Aug 2, 2023 · 526e2cf · 526e2cf
2 parents 625b169 + 6485c04
commit 526e2cf
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 26 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,11 @@
+2.5.0-34 | 2023-08-02 11:35:59 -0700
+
+  * Remove usage of FindRequiredPackage (Tim Wojtulewicz, Corelight)
+
+  * Require CMake 3.15 for consistency with other Zeek projects (Tim Wojtulewicz, Corelight)
+
+  * Update submodules for find_package() fixes (Tim Wojtulewicz, Corelight)
+
 2.5.0-24 | 2023-04-27 12:13:34 +0200
 
   * Multi-logger handling (Arne Welzel, Corelight)

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
 project(ZeekControl C CXX)
 
 include(GNUInstallDirs)
@@ -14,8 +14,6 @@ set(ETC "${ZEEK_ETC_INSTALL_DIR}")
 ########################################################################
 ## Dependency Configuration
 
-include(FindRequiredPackage)
-
 if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/auxil/pysubnettree/CMakeLists.txt)
     add_subdirectory(auxil/pysubnettree)
     set(SUBNETTREE_FOUND true)
@@ -36,8 +34,9 @@ endif ()
 
 find_package(Zeek)
 list(APPEND Python_ADDITIONAL_VERSIONS 3)
-FindRequiredPackage(PythonInterp)
-FindRequiredPackage(SubnetTree)
+set(ZEEKCTL_PYTHON_MIN 3.7.0)
+find_package(Python ${ZEEKCTL_PYTHON_MIN} REQUIRED COMPONENTS Interpreter)
+find_package(SubnetTree)
 find_package(PCAP)
 
 find_program(SENDMAIL sendmail PATHS /usr/sbin)
@@ -49,22 +48,9 @@ if (NOT SENDMAIL)
     set(SENDMAIL /usr/sbin/sendmail)
 endif ()
 
-if (MISSING_PREREQS)
-    foreach (prereq ${MISSING_PREREQ_DESCS})
-        message(SEND_ERROR ${prereq})
-    endforeach ()
-    message(FATAL_ERROR "Configuration aborted due to missing prerequisites")
-endif ()
-
-set(ZEEKCTL_PYTHON_MIN 3.5.0)
-
-if ( PYTHON_VERSION_STRING VERSION_LESS ${ZEEKCTL_PYTHON_MIN} )
-    message(FATAL_ERROR "Python ${ZEEKCTL_PYTHON_MIN} or greater is required.")
-endif ()
-
 if (NOT CMAKE_CROSSCOMPILING)
-    execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sqlite3"
-                    RESULT_VARIABLE PYSQLITE3_IMPORT_RESULT)
+    execute_process(COMMAND "${Python_EXECUTABLE}" -c "import sqlite3"
+		    RESULT_VARIABLE PYSQLITE3_IMPORT_RESULT)
 
     if ( NOT PYSQLITE3_IMPORT_RESULT EQUAL 0 )
         message(FATAL_ERROR "The sqlite3 python module is required to use "

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.5.0-24
+2.5.0-34
diff --git a/auxil/capstats b/auxil/capstats
diff --git a/auxil/pysubnettree b/auxil/pysubnettree
diff --git a/auxil/trace-summary b/auxil/trace-summary
diff --git a/cmake b/cmake
diff --git a/doc/main.rst b/doc/main.rst
@@ -3,7 +3,7 @@
 .. Note: This file includes further autogenerated ones.
 ..
 .. Version number is filled in automatically.
-.. |version| replace:: 2.5.0-24
+.. |version| replace:: 2.5.0-34
 
 ===========
 ZeekControl