From c201db96314ac7f3bccf09b6e2544bb00f6efe64 Mon Sep 17 00:00:00 2001 From: Vaclav Blazek Date: Thu, 20 Oct 2022 16:41:36 +0200 Subject: [PATCH] updated submodules to latest stuff --- externals/buildsys/cmake | 2 +- externals/libgeo | 2 +- externals/libgeometry | 2 +- externals/libimgproc | 2 +- externals/libsemantic | 2 +- externals/libutility | 2 +- mapproxy/CMakeLists.txt | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/externals/buildsys/cmake b/externals/buildsys/cmake index 004807b..4f60a68 160000 --- a/externals/buildsys/cmake +++ b/externals/buildsys/cmake @@ -1 +1 @@ -Subproject commit 004807bda3c356abb4e4bcc2faaea5c15824acda +Subproject commit 4f60a6881fcf3cbcaab2e3a43837d34c296751c6 diff --git a/externals/libgeo b/externals/libgeo index 6ff3630..8a1c9d1 160000 --- a/externals/libgeo +++ b/externals/libgeo @@ -1 +1 @@ -Subproject commit 6ff3630d2767555c1afcecae72257c38dfd7c0a8 +Subproject commit 8a1c9d19ace93067930527aa1bff5d5d29e91ee9 diff --git a/externals/libgeometry b/externals/libgeometry index bb4d0b8..4203086 160000 --- a/externals/libgeometry +++ b/externals/libgeometry @@ -1 +1 @@ -Subproject commit bb4d0b8afb22db7d47c1c5159139cc5c16e12933 +Subproject commit 42030862cbe5882d8ee43661474208049c5877ee diff --git a/externals/libimgproc b/externals/libimgproc index a206125..23a8005 160000 --- a/externals/libimgproc +++ b/externals/libimgproc @@ -1 +1 @@ -Subproject commit a2061256708361d85e3aa8ac4f02f99e9a337c1b +Subproject commit 23a8005c98c637ba5c60bdaf8e112fd4fcc510df diff --git a/externals/libsemantic b/externals/libsemantic index 1a1fed0..1c8a52e 160000 --- a/externals/libsemantic +++ b/externals/libsemantic @@ -1 +1 @@ -Subproject commit 1a1fed0560ca806b55481a8a295e83df54cca79b +Subproject commit 1c8a52e42d0282481180f88df354df4f30b87a4e diff --git a/externals/libutility b/externals/libutility index 640d02c..451296d 160000 --- a/externals/libutility +++ b/externals/libutility @@ -1 +1 @@ -Subproject commit 640d02ca66d9a8831b9ba4bd03837a9b6f487ca5 +Subproject commit 451296d0f8c9d0c372cce77d28bbaa74f266ab74 diff --git a/mapproxy/CMakeLists.txt b/mapproxy/CMakeLists.txt index 862c8ab..99af5b4 100644 --- a/mapproxy/CMakeLists.txt +++ b/mapproxy/CMakeLists.txt @@ -26,7 +26,7 @@ find_package(OpenCV REQUIRED) find_package(GDAL REQUIRED) include_directories(SYSTEM ${GDAL_INCLUDE_DIR}) -find_package(Proj REQUIRED) +find_package(PROJ REQUIRED) include_directories(${PROJ_INCLUDE_DIR}) find_package(GeographicLib REQUIRED) include_directories(${GeographicLib_INCLUDE_DIR}) @@ -68,7 +68,7 @@ include_directories(${ICU_INCLUDE_DIRS}) enable_python(3) include_directories(${PYTHONLIBS_INCLUDE_DIRS}) -find_package(TinyXML2 REQUIRED) +find_package(tinyxml2 REQUIRED) include_directories(${TINYXML2_INCLUDE_DIR}) find_package(Markdown REQUIRED)