cmake: Improve handling of GPDS dependency

simulton · Aug 23, 2023 · ac06ce8 · ac06ce8
1 parent 10b2f99
commit ac06ce8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,6 +16,9 @@ option(QSCHEMATIC_DEPENDENCY_GPDS_DOWNLOAD "Whether to pull the GPDS dependency
 set(QSCHEMATIC_DEPENDENCY_GPDS_TARGET "gpds::gpds-static" CACHE STRING "The CMake target of the GPDS library to use")
 set(CMAKE_DEBUG_POSTFIX d)
 
+# Project requirements
+set(QSCHEMATIC_DEPENDENCY_GPDS_MINIMUM_VERSION "1.6.0")
+
 # Include the library
 add_subdirectory(qschematic)
 

diff --git a/qschematic/external.cmake b/qschematic/external.cmake
@@ -7,7 +7,7 @@ if (QSCHEMATIC_DEPENDENCY_GPDS_DOWNLOAD)
     FetchContent_Declare(
         gpds
         GIT_REPOSITORY https://github.com/simulton/gpds
-        GIT_TAG        1.6.0
+        GIT_TAG        ${QSCHEMATIC_DEPENDENCY_GPDS_MINIMUM_VERSION}
     )
     FetchContent_GetProperties(gpds)
     if(NOT gpds_POPULATED)
@@ -24,6 +24,7 @@ if (QSCHEMATIC_DEPENDENCY_GPDS_DOWNLOAD)
 else()
     find_package(
         gpds
+        ${QSCHEMATIC_DEPENDENCY_GPDS_MINIMUM_VERSION}
         REQUIRED
     )
 endif()

diff --git a/qschematic/qschematic-config.cmake.in b/qschematic/qschematic-config.cmake.in
@@ -5,6 +5,7 @@ include(CMakeFindDependencyMacro)
 ########################################################################################################################
 
 set(QSCHEMATIC_DEPENDENCY_GPDS_DOWNLOAD @QSCHEMATIC_DEPENDENCY_GPDS_DOWNLOAD@)
+set(QSCHEMATIC_DEPENDENCY_GPDS_MINIMUM_VERSION @QSCHEMATIC_DEPENDENCY_GPDS_MINIMUM_VERSION@)
 
 # Qt
 find_dependency(
@@ -27,7 +28,11 @@ endif()
 
 # GPDS
 if (NOT QSCHEMATIC_DEPENDENCY_GPDS_DOWNLOAD)
-    find_dependency(gpds)
+    find_dependency(
+        gpds
+        ${QSCHEMATIC_DEPENDENCY_GPDS_MINIMUM_VERSION}
+        REQUIRED
+    )
 endif()
 
 # Add the targets file