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

* origin/topic/timw/cmake-find-package: Remove usage of FindRequiredPackage
zeek · Aug 3, 2023 · 84b730f · 84b730f
2 parents 1e0a4a7 + b98bffb
commit 84b730f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 14 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+0.61.0-11 | 2023-08-03 09:35:16 -0700
+
+  * Remove usage of FindRequiredPackage (Tim Wojtulewicz, Corelight)
+
 0.61.0-9 | 2023-07-02 14:52:25 -0700
 
   * Add /J flag on Windows to force unsigned char (Tim Wojtulewicz, Corelight)

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,17 +25,8 @@ include(GNUInstallDirs)
 ########################################################################
 ## Dependency Configuration
 
-include(FindRequiredPackage)
-
-FindRequiredPackage(FLEX)
-FindRequiredPackage(BISON)
-
-if (MISSING_PREREQS)
-  foreach (prereq ${MISSING_PREREQ_DESCS})
-      message(SEND_ERROR ${prereq})
-  endforeach ()
-  message(FATAL_ERROR "Configuration aborted due to missing prerequisites")
-endif ()
+find_package(FLEX REQUIRED)
+find_package(BISON REQUIRED)
 
 if (MSVC)
   add_compile_options(/J) # Similar to -funsigned-char on other platforms

diff --git a/README b/README
@@ -1,7 +1,7 @@
 ..	-*- mode: rst-mode -*-
 ..
 .. Version number is filled in automatically.
-.. |version| replace:: 0.61.0-9
+.. |version| replace:: 0.61.0-11
 
 ======
 BinPAC

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.61.0-9
+0.61.0-11
diff --git a/cmake b/cmake
+2 −0		FindRequiredPackage.cmake
+2 −2		FindSubnetTree.cmake
+2 −2		ZeekPluginDynamic.cmake
+1 −1		zeek-plugin-create-package.sh