CMake: Update minimal version and fetching google test

usi-verification-and-security · Sep 4, 2024 · 3f57615 · 3f57615
1 parent 876b776
commit 3f57615
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.14)
 
 set(OPENSMT_VERSION_MAJOR 2)
 set(OPENSMT_VERSION_MINOR 7)

diff --git a/parallel-test/CMakeLists.txt b/parallel-test/CMakeLists.txt
@@ -3,14 +3,11 @@ include(FetchContent)
 FetchContent_Declare(
     googletest
     GIT_REPOSITORY https://github.com/google/googletest.git
-    GIT_TAG release-1.11.0
+    GIT_TAG v1.15.2
+    EXCLUDE_FROM_ALL
 )
 
-FetchContent_GetProperties(googletest)
-if(NOT googletest_POPULATED)
-  FetchContent_Populate(googletest)
-  add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR} EXCLUDE_FROM_ALL)
-endif()
+FetchContent_MakeAvailable(googletest)
 
 add_subdirectory(unit)
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -3,14 +3,11 @@ include(FetchContent)
 FetchContent_Declare(
     googletest
     GIT_REPOSITORY https://github.com/google/googletest.git
-    GIT_TAG v1.14.0
+    GIT_TAG v1.15.2
+    EXCLUDE_FROM_ALL
 )
 
-FetchContent_GetProperties(googletest)
-if(NOT googletest_POPULATED)
-  FetchContent_Populate(googletest)
-  add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR} EXCLUDE_FROM_ALL)
-endif()
+FetchContent_MakeAvailable(googletest)
 
 add_subdirectory(unit)