From be67565dd6d889e1918f6c9de94111c369124fb9 Mon Sep 17 00:00:00 2001
From: aornugent <aornugent@gmail.com>
Date: Sun, 20 Feb 2022 15:47:42 +1100
Subject: [PATCH] Fix C, Mutex imports in Poco 1.11.1

---
 Source/CMakeLists.txt                                       | 6 +++---
 Source/moja.flint/include/moja/flint/writesystemconfig.h    | 4 +++-
 Source/moja.flint/include/moja/flint/writevariablegrid.h    | 4 +++-
 .../include/moja/modules/gdal/writevariablegeotiff.h        | 6 +++++-
 Source/moja.modules.gdal/src/writevariablegeotiff.cpp       | 2 --
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 55d09d1..daa4832 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.10.0)
-project(moja VERSION 1.0.6 LANGUAGES CXX)
+project(moja VERSION 1.1.0 LANGUAGES CXX C)
 
 #turn on using solution folders
 set_property( GLOBAL PROPERTY USE_FOLDERS ON)
@@ -55,7 +55,7 @@ option(MOJA_STATIC				"Set to OFF|ON (default is OFF) to control build of moja a
 
 # Uncomment from next two lines to force statitc or dynamic library, default is autodetection
 if(MOJA_STATIC)
-    add_definitions( -DMOJA_STATIC -DMOJA_NO_AUTOMATIC_LIBS)    
+    add_definitions( -DMOJA_STATIC -DMOJA_NO_AUTOMATIC_LIBS)
     set( LIB_MODE STATIC )
     message(STATUS "Building static libraries")
 else(MOJA_STATIC)
@@ -273,7 +273,7 @@ install(FILES ${MOJA_PKG_CONFIG_FILES}
         DESTINATION lib${LIB_SUFFIX}/pkgconfig)
 
 export(PACKAGE Moja)
-		
+
 message(STATUS "CMake ${CMAKE_VERSION} successfully configured ${PROJECT_NAME} using ${CMAKE_GENERATOR} generator")
 message(STATUS "Installation target path: ${CMAKE_INSTALL_PREFIX}")
 
diff --git a/Source/moja.flint/include/moja/flint/writesystemconfig.h b/Source/moja.flint/include/moja/flint/writesystemconfig.h
index ccae118..2bed52b 100644
--- a/Source/moja.flint/include/moja/flint/writesystemconfig.h
+++ b/Source/moja.flint/include/moja/flint/writesystemconfig.h
@@ -3,6 +3,8 @@
 
 #include <moja/flint/modulebase.h>
 
+#include <Poco/Mutex.h>
+
 #include <boost/iostreams/stream_buffer.hpp>
 
 namespace moja {
@@ -138,4 +140,4 @@ class FLINT_API WriteSystemConfig : public flint::ModuleBase {
 }  // namespace flint
 }  // namespace moja
 
-#endif  // MOJA_FLINT_WRITESYSTEMCONFIG_H_
\ No newline at end of file
+#endif  // MOJA_FLINT_WRITESYSTEMCONFIG_H_
diff --git a/Source/moja.flint/include/moja/flint/writevariablegrid.h b/Source/moja.flint/include/moja/flint/writevariablegrid.h
index 080efc7..7cb1a0c 100644
--- a/Source/moja.flint/include/moja/flint/writevariablegrid.h
+++ b/Source/moja.flint/include/moja/flint/writevariablegrid.h
@@ -7,6 +7,8 @@
 #include "moja/flint/ipool.h"
 #include "moja/flint/modulebase.h"
 
+#include <Poco/Mutex.h>
+
 #include <boost/algorithm/string.hpp>
 
 #include <algorithm>
@@ -175,4 +177,4 @@ class FLINT_API WriteVariableGrid : public ModuleBase {
 }  // namespace flint
 }  // namespace moja
 
-#endif  // MOJA_FLINT_WRITESPATIALDATAGRID_H_
\ No newline at end of file
+#endif  // MOJA_FLINT_WRITESPATIALDATAGRID_H_
diff --git a/Source/moja.modules.gdal/include/moja/modules/gdal/writevariablegeotiff.h b/Source/moja.modules.gdal/include/moja/modules/gdal/writevariablegeotiff.h
index 25241ff..3defb97 100644
--- a/Source/moja.modules.gdal/include/moja/modules/gdal/writevariablegeotiff.h
+++ b/Source/moja.modules.gdal/include/moja/modules/gdal/writevariablegeotiff.h
@@ -8,6 +8,10 @@
 #include <moja/flint/ipool.h>
 #include <moja/flint/modulebase.h>
 
+#include <Poco/File.h>
+#include <Poco/Mutex.h>
+#include <Poco/Path.h>
+
 #include <unordered_map>
 
 namespace moja {
@@ -176,4 +180,4 @@ class GDAL_API WriteVariableGeotiff : public flint::ModuleBase {
 }  // namespace modules
 }  // namespace moja
 
-#endif  // MOJA_MODULES_GDAL_WRITEVARIABLEGEOTIFF_H_
\ No newline at end of file
+#endif  // MOJA_MODULES_GDAL_WRITEVARIABLEGEOTIFF_H_
diff --git a/Source/moja.modules.gdal/src/writevariablegeotiff.cpp b/Source/moja.modules.gdal/src/writevariablegeotiff.cpp
index 7885df3..578afa3 100644
--- a/Source/moja.modules.gdal/src/writevariablegeotiff.cpp
+++ b/Source/moja.modules.gdal/src/writevariablegeotiff.cpp
@@ -12,9 +12,7 @@
 #include <moja/notificationcenter.h>
 #include <moja/signals.h>
 
-#include <Poco/File.h>
 #include <Poco/Mutex.h>
-#include <Poco/Path.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/format.hpp>