educelab · csparker247 · Feb 13, 2025 · Jan 23, 2025 · Feb 13, 2025 · Feb 13, 2025
diff --git a/.github/workflows/build_packages.yml b/.github/workflows/build_packages.yml
@@ -18,7 +18,7 @@ jobs:
     env:
       MACOSX_DEPLOYMENT_TARGET: "14.5"
       QT_VERSION: "6.7.2"
-      EXTRA_CMAKE_FLAGS: "-DCMAKE_BUILD_TYPE=Release -DVC_PREBUILT_LIBS=ON -DVC_BUILD_ACVD=ON -DCMAKE_OSX_ARCHITECTURES:STRING='x86_64;arm64'"
+      EXTRA_CMAKE_FLAGS: "-DCMAKE_BUILD_TYPE=Release -DVC_PREBUILT_LIBS=ON -DVC_BUILD_ACVD=ON -DVC_BUILD_JSON=OFF -DCMAKE_OSX_ARCHITECTURES:STRING='x86_64;arm64'"
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -59,7 +59,7 @@ jobs:
     if: ${{ github.event_name }} == "merge_request_event" || !(${{ github.ref }} && $CI_OPEN_MERGE_REQUESTS) || ${{ github.ref }}
     timeout-minutes: 180
     env:
-      EXTRA_CMAKE_FLAGS: "-DVC_BUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVC_BUILD_TESTS=ON"
+      EXTRA_CMAKE_FLAGS: "-DVC_BUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVC_BUILD_TESTS=ON -DVC_BUILD_JSON=OFF"
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -87,7 +87,7 @@ jobs:
     if: ${{ github.event_name }} == "merge_request_event" || !(${{ github.ref }} && $CI_OPEN_MERGE_REQUESTS) || ${{ github.ref }}
     timeout-minutes: 180
     env:
-      EXTRA_CMAKE_FLAGS: "-DVC_BUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVC_BUILD_TESTS=ON"
+      EXTRA_CMAKE_FLAGS: "-DVC_BUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVC_BUILD_TESTS=ON -DVC_BUILD_JSON=OFF"
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.24..3.27 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.28..3.31 FATAL_ERROR)
 include(FetchContent)
 include(CMakeDependentOption)
 
@@ -104,4 +104,4 @@ endif()
 # Setup the config files #
 include(VCPackageConfig)
 # Install to system directories
-include(VCInstall)
+include(VCInstall)
diff --git a/cmake/BuildACVD.cmake b/cmake/BuildACVD.cmake
@@ -1,18 +1,12 @@
 option(VC_BUILD_ACVD "Build in-source ACVD" ON)
 if(VC_BUILD_ACVD)
-  # Declare the project
   FetchContent_Declare(
       acvd
       GIT_REPOSITORY https://gitlab.com/educelab/acvd.git
       GIT_TAG v1.2.1
+      EXCLUDE_FROM_ALL
   )
-
-  # Populate the project but exclude from all
-  FetchContent_GetProperties(acvd)
-  if(NOT acvd_POPULATED)
-    FetchContent_Populate(acvd)
-    add_subdirectory(${acvd_SOURCE_DIR} ${acvd_BINARY_DIR} EXCLUDE_FROM_ALL)
-  endif()
+  FetchContent_MakeAvailable(acvd)
 else()
   find_package(ACVD 1.2 REQUIRED)
 endif()
diff --git a/cmake/BuildIndicators.cmake b/cmake/BuildIndicators.cmake
@@ -1,13 +1,7 @@
-# Declare the project
 FetchContent_Declare(
     indicators
     GIT_REPOSITORY https://github.com/p-ranav/indicators.git
     GIT_TAG 222382c
+    EXCLUDE_FROM_ALL
 )
-
-# Populate the project but exclude from all
-FetchContent_GetProperties(indicators)
-if(NOT indicators_POPULATED)
-    FetchContent_Populate(indicators)
-    add_subdirectory(${indicators_SOURCE_DIR} ${indicators_BINARY_DIR} EXCLUDE_FROM_ALL)
-endif()
+FetchContent_MakeAvailable(indicators)
diff --git a/cmake/BuildJSON.cmake b/cmake/BuildJSON.cmake
@@ -4,15 +4,11 @@ if(VC_BUILD_JSON)
         json
         URL https://github.com/nlohmann/json/archive/v3.11.3.tar.gz
         DOWNLOAD_EXTRACT_TIMESTAMP ON
+        EXCLUDE_FROM_ALL
     )
-
-    FetchContent_GetProperties(json)
-    if(NOT json_POPULATED)
-        set(JSON_BuildTests OFF CACHE INTERNAL "")
-        set(JSON_Install ON CACHE INTERNAL "")
-        FetchContent_Populate(json)
-        add_subdirectory(${json_SOURCE_DIR} ${json_BINARY_DIR} EXCLUDE_FROM_ALL)
-    endif()
+    set(JSON_BuildTests OFF CACHE INTERNAL "")
+    set(JSON_Install ON CACHE INTERNAL "")
+    FetchContent_MakeAvailable(json)
 else()
     find_package(nlohmann_json 3.9.1 REQUIRED)
 endif()
diff --git a/cmake/BuildOpenABF.cmake b/cmake/BuildOpenABF.cmake
@@ -1,13 +1,7 @@
-# Declare the project
 FetchContent_Declare(
     openabf
     GIT_REPOSITORY https://gitlab.com/educelab/OpenABF.git
     GIT_TAG 63afa9e3
+    EXCLUDE_FROM_ALL
 )
-
-# Populate the project but exclude from all
-FetchContent_GetProperties(openabf)
-if(NOT openabf_POPULATED)
-  FetchContent_Populate(openabf)
-  add_subdirectory(${openabf_SOURCE_DIR} ${openabf_BINARY_DIR} EXCLUDE_FROM_ALL)
-endif()
+FetchContent_MakeAvailable(openabf)
diff --git a/cmake/Buildbvh.cmake b/cmake/Buildbvh.cmake
@@ -1,13 +1,7 @@
-# Declare the project
 FetchContent_Declare(
   bvh
   GIT_REPOSITORY https://github.com/madmann91/bvh.git
   GIT_TAG 2fd0db6
+  EXCLUDE_FROM_ALL
 )
-
-# Populate the project but exclude from all
-FetchContent_GetProperties(bvh)
-if(NOT bvh_POPULATED)
-  FetchContent_Populate(bvh)
-  add_subdirectory(${bvh_SOURCE_DIR} ${bvh_BINARY_DIR} EXCLUDE_FROM_ALL)
-endif()
+FetchContent_MakeAvailable(bvh)
diff --git a/cmake/Buildsmgl.cmake b/cmake/Buildsmgl.cmake
@@ -2,19 +2,10 @@ FetchContent_Declare(
     smgl
     GIT_REPOSITORY https://gitlab.com/educelab/smgl.git
     GIT_TAG v0.10.1
-    CMAKE_CACHE_ARGS
-        -DSMGL_BUILD_JSON:BOOL=ON
-        -DSMGL_USE_BOOSTFS:BOOL=ON
-        -DSMGL_BUILD_TESTS:BOOL=OFF
-        -DSMGL_BUILD_DOCS:BOOL=OFF
+    EXCLUDE_FROM_ALL
 )
-
-FetchContent_GetProperties(smgl)
-if(NOT smgl_POPULATED)
-    set(SMGL_BUILD_JSON ON CACHE INTERNAL "")
-    set(SMGL_USE_BOOSTFS ${VC_USE_BOOSTFS} CACHE INTERNAL "")
-    set(SMGL_BUILD_TESTS OFF CACHE INTERNAL "")
-    set(SMGL_BUILD_DOCS OFF CACHE INTERNAL "")
-    FetchContent_Populate(smgl)
-    add_subdirectory(${smgl_SOURCE_DIR} ${smgl_BINARY_DIR} EXCLUDE_FROM_ALL)
-endif()
+set(SMGL_BUILD_JSON ${VC_BUILD_JSON} CACHE INTERNAL "")
+set(SMGL_USE_BOOSTFS ${VC_USE_BOOSTFS} CACHE INTERNAL "")
+set(SMGL_BUILD_TESTS OFF CACHE INTERNAL "")
+set(SMGL_BUILD_DOCS OFF CACHE INTERNAL "")
+FetchContent_MakeAvailable(smgl)
diff --git a/cmake/VCFindDependencies.cmake b/cmake/VCFindDependencies.cmake
@@ -53,8 +53,9 @@ include(BuildACVD)
 ### Eigen ###
 find_package(Eigen3 3.3 REQUIRED)
 if(CMAKE_GENERATOR MATCHES "Ninja|.*Makefiles.*" AND "${CMAKE_BUILD_TYPE}" MATCHES "^$|Debug")
-    message(AUTHOR_WARNING "Configuring a Debug build. Eigen performance will be degraded. If you need debug symbols, \
-    consider setting CMAKE_BUILD_TYPE to RelWithDebInfo. Otherwise, set to Release to maximize performance.")
+    message(AUTHOR_WARNING "Configuring a Debug build. Eigen performance will \
+    be degraded. If you need debug symbols, consider setting CMAKE_BUILD_TYPE \
+    to RelWithDebInfo. Otherwise, set to Release to maximize performance.")
 endif()
 
 ### OpenCV ###
@@ -101,16 +102,10 @@ if(VC_BUILD_TESTS)
         googletest
         GIT_REPOSITORY https://github.com/google/googletest.git
         GIT_TAG        v1.14.0
-        CMAKE_CACHE_ARGS
-            -DINSTALL_GTEST:BOOL=OFF
+        EXCLUDE_FROM_ALL
     )
-
-    FetchContent_GetProperties(googletest)
-    if(NOT googletest_POPULATED)
-        set(INSTALL_GTEST OFF CACHE BOOL OFF FORCE)
-        FetchContent_Populate(googletest)
-        add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR} EXCLUDE_FROM_ALL)
-    endif()
+    set(INSTALL_GTEST OFF CACHE INTERNAL "")
+    FetchContent_MakeAvailable(googletest)
 endif()
 
 # Python bindings