From 6e8ca85683f899a752a4f207f0b256d1f6891aae Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Mon, 31 Jul 2023 11:24:58 -0700 Subject: [PATCH 1/3] Remove usage of FindRequiredPackage --- CMakeLists.txt | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fb16a86..9b43a60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,15 +9,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.cc.in ######################################################################## ## Dependency Configuration -include(FindRequiredPackage) -FindRequiredPackage(PCAP) - -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(PCAP REQUIRED) include_directories(BEFORE ${PCAP_INCLUDE_DIR} From 3b95707e38dac084a0ad8a68a14bb61eaf585ddd Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Mon, 31 Jul 2023 11:25:22 -0700 Subject: [PATCH 2/3] Require CMake 3.15 for consistency with other Zeek projects --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b43a60..97ff16a 100644 --- 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(capstats C CXX) include(cmake/CommonCMakeConfig.cmake) From a342d42c6edde409f0b71023a35c844a7f8dcbd1 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Wed, 2 Aug 2023 11:04:47 -0700 Subject: [PATCH 3/3] Update cmake submodule to deprecate FindRequiredPackage --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index 1be78cc..7a8069c 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 1be78cc8a889d95db047f473a0f48e0baee49f33 +Subproject commit 7a8069c2ee84a82119ce83033454e22942043570