Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix C, Mutex imports in Poco 1.11.1 #116

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix C, Mutex imports in Poco 1.11.1 #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Source/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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}")

Expand Down
4 changes: 3 additions & 1 deletion Source/moja.flint/include/moja/flint/writesystemconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

#include <moja/flint/modulebase.h>

#include <Poco/Mutex.h>

#include <boost/iostreams/stream_buffer.hpp>

namespace moja {
Expand Down Expand Up @@ -138,4 +140,4 @@ class FLINT_API WriteSystemConfig : public flint::ModuleBase {
} // namespace flint
} // namespace moja

#endif // MOJA_FLINT_WRITESYSTEMCONFIG_H_
#endif // MOJA_FLINT_WRITESYSTEMCONFIG_H_
4 changes: 3 additions & 1 deletion Source/moja.flint/include/moja/flint/writevariablegrid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -175,4 +177,4 @@ class FLINT_API WriteVariableGrid : public ModuleBase {
} // namespace flint
} // namespace moja

#endif // MOJA_FLINT_WRITESPATIALDATAGRID_H_
#endif // MOJA_FLINT_WRITESPATIALDATAGRID_H_
6 changes: 5 additions & 1 deletion Source/moja.modules.gdal/include/moja/modules/gdal/writevariablegeotiff.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -176,4 +180,4 @@ class GDAL_API WriteVariableGeotiff : public flint::ModuleBase {
} // namespace modules
} // namespace moja

#endif // MOJA_MODULES_GDAL_WRITEVARIABLEGEOTIFF_H_
#endif // MOJA_MODULES_GDAL_WRITEVARIABLEGEOTIFF_H_
2 changes: 0 additions & 2 deletions Source/moja.modules.gdal/src/writevariablegeotiff.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down