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

* origin/topic/timw/cmake-find-package: Remove usage of FindRequiredPackage
zeek · Aug 3, 2023 · c7bf54c · c7bf54c
2 parents a4aadc5 + 23d26c2
commit c7bf54c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+1.8.0-11 | 2023-08-03 09:36:59 -0700
+
+  * Remove usage of FindRequiredPackage (Tim Wojtulewicz, Corelight)
+
 1.8.0-9 | 2023-07-02 14:51:55 -0700
 
   * Add /J flag on Windows to force unsigned char (Tim Wojtulewicz, Corelight)

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,17 +3,8 @@ project(BifCl C CXX)
 
 include(cmake/CommonCMakeConfig.cmake)
 
-include(FindRequiredPackage)
-
-FindRequiredPackage(BISON)
-FindRequiredPackage(FLEX)
-
-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(BISON REQUIRED)
+find_package(FLEX REQUIRED)
 
 if (MSVC)
   add_compile_options(/J) # Similar to -funsigned-char on other platforms

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.8.0-9
+1.8.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