Modernized some cmake files

Author: FlorianReimold

CMakeLists.txt

@@ -16,7 +16,7 @@
 #
 # =========================== LICENSE =================================
 
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.14...4.0)
 
 # Project call
 include("${CMAKE_CURRENT_LIST_DIR}/udpcap/version.cmake")

thirdparty/GTest/GTest_make_available.cmake

@@ -1,15 +1,13 @@
 include(FetchContent)
 FetchContent_Declare(GTest
     GIT_REPOSITORY https://github.com/google/googletest.git
-    GIT_TAG origin/v1.14.x # This is not a Tag, but the release branch
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND ""
+    GIT_TAG origin/v1.16.x # This is not a Tag, but the release branch
+    DOWNLOAD_EXTRACT_TIMESTAMP FALSE
     )
-FetchContent_GetProperties(GTest)
-if(NOT gtest_POPULATED)
-    message(STATUS "Fetching GTest...")
-    FetchContent_Populate(GTest)
-endif()
+
+message(STATUS "Fetching GTest...")
+FetchContent_MakeAvailable(GTest)
+
 set(GTest_ROOT_DIR "${gtest_SOURCE_DIR}")
 
 # Googletest automatically forces MT instead of MD if we do not set this option.
@@ -19,15 +17,5 @@ if(MSVC)
     set(INSTALL_GTEST OFF CACHE BOOL "My option" FORCE)
 endif()
 
-add_subdirectory("${GTest_ROOT_DIR}" EXCLUDE_FROM_ALL)
-
-if(NOT TARGET GTest::gtest)
-    add_library(GTest::gtest ALIAS gtest)
-endif()
-
-if(NOT TARGET GTest::gtest_main)
-    add_library(GTest::gtest_main ALIAS gtest_main)
-endif()
-
 # Prepend googletest-module/FindGTest.cmake to Module Path
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/Modules/")

thirdparty/asio/asio_make_available.cmake

@@ -1,14 +1,12 @@
 include(FetchContent)
 FetchContent_Declare(asio
-	GIT_REPOSITORY https://github.com/chriskohlhoff/asio.git
-	GIT_TAG asio-1-24-0
-	CONFIGURE_COMMAND ""
-	BUILD_COMMAND ""
-	)
-FetchContent_GetProperties(asio)
-if(NOT asio_POPULATED)
-	message(STATUS "Fetching asio...")
-	FetchContent_Populate(asio)
-endif()
+    GIT_REPOSITORY https://github.com/chriskohlhoff/asio.git
+    GIT_TAG asio-1-24-0
+    DOWNLOAD_EXTRACT_TIMESTAMP FALSE
+    )
+
+message(STATUS "Fetching asio...")
+FetchContent_MakeAvailable(asio)
+
 set(asio_ROOT_DIR "${asio_SOURCE_DIR}")
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/Modules/)

thirdparty/npcap/npcap_make_available.cmake

@@ -7,13 +7,11 @@ include(FetchContent)
 FetchContent_Declare(npcap_sdk
     URL      "${NPCAP_SDK_ARCHIVE_URL}"
     URL_HASH "${NPCAP_SDK_ARCHIVE_HASH}"
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND ""
+    DOWNLOAD_EXTRACT_TIMESTAMP FALSE
     )
-FetchContent_GetProperties(npcap_sdk)
-if(NOT npcap-sdk_POPULATED)
-    message(STATUS "Fetching npcap_sdk...")
-    FetchContent_Populate(npcap_sdk)
-endif()
+
+message(STATUS "Fetching npcap_sdk...")
+FetchContent_MakeAvailable(npcap_sdk)
+
 set(npcap_ROOT_DIR "${npcap_sdk_SOURCE_DIR}")
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/Modules/)

thirdparty/pcapplusplus/pcapplusplus_make_available.cmake

@@ -7,13 +7,10 @@ include(FetchContent)
 FetchContent_Declare(pcapplusplus
     URL      "${PCAPPLUSPLUS_ARCHIVE_URL}"
     URL_HASH "${PCAPPLUSPLUS_ARCHIVE_HASH}"
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND ""
     )
-FetchContent_GetProperties(pcapplusplus)
-if(NOT pcapplusplus_POPULATED)
-    message(STATUS "Fetching Pcap++...")
-    FetchContent_Populate(pcapplusplus)
-endif()
+
+message(STATUS "Fetching Pcap++...")
+FetchContent_MakeAvailable(pcapplusplus)
+
 set(pcapplusplus_ROOT_DIR "${pcapplusplus_SOURCE_DIR}")
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/Modules/)