chore(build): update cmake version

Signed-off-by: irozzo-1A <[email protected]>

Author: irozzo-1A

.github/workflows/ci.yml

@@ -42,11 +42,12 @@ jobs:
 
       - name: Install a recent version of CMake ⛓️
         run: |
-          curl -L -o /tmp/cmake.tar.gz https://github.com/Kitware/CMake/releases/download/v3.22.5/cmake-3.22.5-linux-$(uname -m).tar.gz
+          CMAKE_VERSION=3.24.4
+          curl -L -o /tmp/cmake.tar.gz https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-$(uname -m).tar.gz
           gzip -d /tmp/cmake.tar.gz
           tar -xpf /tmp/cmake.tar --directory=/tmp
-          cp -R /tmp/cmake-3.22.5-linux-$(uname -m)/* /usr
-          rm -rf /tmp/cmake-3.22.5-linux-$(uname -m)/
+          cp -R /tmp/cmake-${CMAKE_VERSION}-linux-$(uname -m)/* /usr
+          rm -rf /tmp/cmake-${CMAKE_VERSION}-linux-$(uname -m)/
 
       - name: Checkout Libs ⤵️
         uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0

CMakeLists.txt

@@ -30,7 +30,7 @@ if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.txt)
 	)
 endif()
 
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.24)
 
 # Enable MACOSX_RPATH (and keep CMake from complaining).
 if(POLICY CMP0042)

cmake/modules/gtest.cmake

@@ -23,15 +23,15 @@ elseif(NOT USE_BUNDLED_GTEST)
 		PATH_SUFFIXES gtest
 		NAMES gtest.h
 	)
-	find_library(GTEST_LIB NAMES gtest)
-	find_library(GTEST_MAIN_LIB NAMES gtest_main)
+	find_library(GTEST_LIBRARY NAMES gtest)
+	find_library(GTEST_MAIN_LIBRARY NAMES gtest_main)
 	if(GTEST_INCLUDE_DIR
-	   AND GTEST_LIB
-	   AND GTEST_MAIN_LIB
+	   AND GTEST_LIBRARY
+	   AND GTEST_MAIN_LIBRARY
 	)
 		message(
 			STATUS
-				"Found gtest: include: ${GTEST_INCLUDE_DIR}, lib: ${GTEST_LIB}, main lib: ${GTEST_MAIN_LIB}"
+				"Found gtest: include: ${GTEST_INCLUDE_DIR}, lib: ${GTEST_LIBRARY}, main lib: ${GTEST_MAIN_LIBRARY}"
 		)
 	else()
 		message(FATAL_ERROR "Couldn't find system gtest")
@@ -40,23 +40,13 @@ else()
 	include(FetchContent)
 	FetchContent_Declare(
 		gtest
-		URL https://github.com/google/googletest/archive/refs/tags/v1.17.0.tar.gz
-		URL_HASH SHA256=65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c
+		URL https://github.com/google/googletest/archive/refs/tags/v1.16.0.tar.gz
+		URL_HASH SHA256=78c676fc63881529bf97bf9d45948d905a66833fbfa5318ea2cd7478cb98f399
 		OVERRIDE_FIND_PACKAGE
 	)
 	FetchContent_MakeAvailable(gtest)
-
-	set(GTEST_INCLUDE_DIR "${gtest_SOURCE_DIR}/include")
-	set(GTEST_MAIN_LIB "gtest_main")
-	install(
-		DIRECTORY "${GTEST_INCLUDE_DIR}"
-		DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${LIBS_PACKAGE_NAME}"
-		COMPONENT "libs-deps"
-	)
 endif()
 
 if(NOT TARGET gtest)
 	add_custom_target(gtest)
 endif()
-
-include_directories("${GTEST_INCLUDE_DIR}")

test/drivers/CMakeLists.txt

@@ -1,5 +1,7 @@
 message(STATUS "Drivers tests build enabled")
 
+find_package(GTest REQUIRED)
+
 # Configure ia32 action test
 option(ENABLE_IA32_TESTS "Enable ia32 tests. Require ia32 glibc and gcc." ON)
 if(ENABLE_IA32_TESTS)
@@ -45,7 +47,7 @@ set(DRIVERS_TEST_SOURCES
 
 set(DRIVERS_TEST_INCLUDE PRIVATE "${GTEST_INCLUDE}" "${LIBS_DIR}/driver/" "${LIBSCAP_INCLUDE_DIRS}")
 
-set(DRIVERS_TEST_LINK_LIBRARIES scap "${GTEST_LIB}" "${GTEST_MAIN_LIB}")
+set(DRIVERS_TEST_LINK_LIBRARIES scap GTest::gtest GTest::gtest_main)
 
 set(DRIVERS_TEST_DEPENDECIES scap gtest)
 

test/libscap/CMakeLists.txt

@@ -39,7 +39,9 @@ set(LIBSCAP_TESTS_INCLUDE
 # Needed by gtest
 find_package(Threads)
 
-set(LIBSCAP_TESTS_LIBRARIES "${GTEST_LIB}" "${GTEST_MAIN_LIB}" "${CMAKE_THREAD_LIBS_INIT}" scap)
+set(LIBSCAP_TESTS_LIBRARIES "${GTEST_LIBRARY}" "${GTEST_MAIN_LIBRARY}" "${CMAKE_THREAD_LIBS_INIT}"
+							scap
+)
 
 set(LIBSCAP_TESTS_DEPENDENCIES gtest scap)
 

test/libsinsp_e2e/CMakeLists.txt

@@ -15,6 +15,7 @@
 
 message(STATUS "Libsinsp unit e2e tests build enabled")
 
+find_package(GTest REQUIRED)
 if(NOT DEFINED DRIVER_NAME)
 	set(DRIVER_NAME "scap")
 endif()
@@ -57,7 +58,7 @@ else()
 	add_dependencies(libsinsp_e2e_tests driver)
 endif()
 
-target_link_libraries(libsinsp_e2e_tests sinsp "${GTEST_LIB}" "${GTEST_MAIN_LIB}" pthread)
+target_link_libraries(libsinsp_e2e_tests sinsp GTest::gtest GTest::gtest_main pthread)
 
 target_include_directories(
 	libsinsp_e2e_tests PRIVATE ${PROJECT_BINARY_DIR}/driver/src "${CMAKE_CURRENT_BINARY_DIR}"

userspace/libsinsp/test/CMakeLists.txt

@@ -11,7 +11,6 @@
 # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
 # or implied. See the License for the specific language governing permissions and limitations under
 # the License.
-#
 find_package(GTest REQUIRED)
 
 include(jsoncpp)
@@ -187,6 +186,14 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
 	)
 endif()
 
+# Link against additional files could be useful when testing plugins `ADDITIONAL_SINSP_TESTS_SUITE`
+# is a list of source files `;` separated TODO: Remove this once all tests are migrated to
+# sinsp_test_support target
+if(ADDITIONAL_SINSP_TESTS_SUITE)
+	message(STATUS "- Additional sinsp source files: ${ADDITIONAL_SINSP_TESTS_SUITE}")
+	list(APPEND LIBSINSP_UNIT_TESTS_SOURCES "${ADDITIONAL_SINSP_TESTS_SUITE}")
+endif()
+
 add_executable(unit-test-libsinsp ${LIBSINSP_UNIT_TESTS_SOURCES})
 
 if(EMSCRIPTEN)
@@ -209,7 +216,7 @@ target_include_directories(
 )
 
 # Link against sinsp_test_support which already includes sinsp, gtest, tbb, jsoncpp
-target_link_libraries(unit-test-libsinsp sinsp_test_support "${GTEST_MAIN_LIB}")
+target_link_libraries(unit-test-libsinsp sinsp_test_support GTest::gtest_main)
 
 # Add some additional include directories associated with `ADDITIONAL_SINSP_TESTS_SUITE`
 # `ADDITIONAL_SINSP_TESTS_INCLUDE_FOLDERS` is a list of include paths `;` separated