Merge pull request #773 from kordejong/gh771

Consider using config mode in find_package GDAL
computationalgeography · Jan 10, 2025 · 7b9d3ee · 7b9d3ee
2 parents 34e6556 + e090956
commit 7b9d3ee
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -12,15 +12,15 @@ jobs:
 
         strategy:
             matrix:
-                os: ["ubuntu-22.04"]
+                os: ["ubuntu-24.04"]
                 python_version: ["3.10", "3.13"]
                 compiler:
                     # To be recognized by Conan, name must be one of:
                     #     'Visual Studio', 'apple-clang', 'clang', 'gcc', 'intel', 'intel-cc', 'mcst-lcc',
                     #     'msvc', 'qcc', 'sun-cc'
-                    - { name: gcc  , version: 11, c: gcc-10  , cxx: g++-10    , package: g++-10   }
+                    - { name: gcc  , version: 10, c: gcc-10  , cxx: g++-10    , package: g++-10   }
                     - { name: gcc  , version: 12, c: gcc-12  , cxx: g++-12    , package: g++-12   }
-                    - { name: clang, version: 15, c: clang-15, cxx: clang++-15, package: clang-15 }
+                    - { name: clang, version: 18, c: clang-18, cxx: clang++-18, package: clang-18 }
             fail-fast: false
 
         runs-on: ${{ matrix.os }}
@@ -85,7 +85,8 @@ jobs:
                   libvulkan-dev \
                   ${{ matrix.compiler.package }} \
                   ninja-build \
-                  nlohmann-json3-dev
+                  nlohmann-json3-dev \
+                  pybind11-dev
               pip3 install -r ${{ env.lue_source_directory }}/environment/configuration/requirements-dev.txt
 
         - name: "install hpx"

diff --git a/environment/cmake/LueConfiguration.cmake b/environment/cmake/LueConfiguration.cmake
@@ -511,9 +511,9 @@ if(LUE_PYBIND11_REQUIRED)
 
     FetchContent_Declare(pybind11
         GIT_REPOSITORY https://github.com/pybind/pybind11.git
-        GIT_TAG 3e9dfa2866941655c56877882565e7577de6fc7b  # 2.12.0
+        GIT_TAG a2e59f0e7065404b44dfe92a28aca47ba1378dc4  # 2.13.6
         SYSTEM
-        FIND_PACKAGE_ARGS 2.12
+        FIND_PACKAGE_ARGS 2.12 CONFIG
     )
     FetchContent_MakeAvailable(pybind11)
 endif()
@@ -770,7 +770,9 @@ endif()
 
 
 if(LUE_GDAL_REQUIRED)
-    find_package(GDAL REQUIRED)
+    # https://gdal.org/en/stable/development/cmake.html
+    find_package(GDAL REQUIRED CONFIG)
+    message(STATUS "Found GDAL version ${GDAL_VERSION} in ${GDAL_DIR}")
 endif()