From fcbb557a44de483ea8e6c1c5a9bb9ab68d269ee6 Mon Sep 17 00:00:00 2001 From: zosrothko Date: Wed, 22 Mar 2017 07:09:22 +0100 Subject: [PATCH 1/2] Add libpq-dev for PostgreSQL frontend includes --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 847f6a9f6..4560cec9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" == "linux" ]; then tar -xzvf cmake-3.2.3-Linux-x86_64.tar.gz; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export PATH=$PWD/cmake-3.2.3-Linux-x86_64/bin:$PATH; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update -qq; fi - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq -y unixodbc-dev libmysqlclient-dev libsqlite3-dev; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq -y libpq-dev unixodbc-dev libmysqlclient-dev libsqlite3-dev; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq -y g++-arm-linux-gnueabi g++-arm-linux-gnueabihf clang-3.5; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq -y sloccount cppcheck; fi - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi From 42ae8f60b8625e8b9b92b7f9ad28472ab315843f Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Thu, 23 Mar 2017 17:14:57 +0100 Subject: [PATCH 2/2] Add a new constant to avoid including on Linux --- Foundation/include/Poco/UnWindows.h | 7 +++---- PocoDoc/cfg/mkdoc-poco.xml | 2 ++ PocoDoc/cfg/mkdocumentation.xml | 2 ++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Foundation/include/Poco/UnWindows.h b/Foundation/include/Poco/UnWindows.h index 862bfb060..7a393dddb 100644 --- a/Foundation/include/Poco/UnWindows.h +++ b/Foundation/include/Poco/UnWindows.h @@ -80,16 +80,15 @@ #endif #endif +#if !defined(POCO_NO_WINDOWS_H) +#include +#endif // To prevent Platform_WIN32.h to modify version defines, // uncomment this, otherwise versions will be automatically // discovered in Platform_WIN32.h. // #define POCO_FORCE_MIN_WINDOWS_OS_SUPPORT - -#include - - #if !defined(POCO_NO_UNWINDOWS) // A list of annoying macros to #undef. // Extend as required. diff --git a/PocoDoc/cfg/mkdoc-poco.xml b/PocoDoc/cfg/mkdoc-poco.xml index f8e6bddec..6ea368501 100644 --- a/PocoDoc/cfg/mkdoc-poco.xml +++ b/PocoDoc/cfg/mkdoc-poco.xml @@ -49,10 +49,12 @@ ${Includes}, -I/usr/local/mysql/include, -I/usr/include/mysql, + -I/usr/include/postgresql, -D_DEBUG, -E, -C, -DPOCO_NO_GCC_API_ATTRIBUTE + -DPOCO_NO_WINDOWS_H true diff --git a/PocoDoc/cfg/mkdocumentation.xml b/PocoDoc/cfg/mkdocumentation.xml index cb980faf5..c2123c799 100644 --- a/PocoDoc/cfg/mkdocumentation.xml +++ b/PocoDoc/cfg/mkdocumentation.xml @@ -46,10 +46,12 @@ ${Includes}, -I/usr/local/mysql/include, -I/usr/include/mysql, + -I/usr/include/postgresql, -D_DEBUG, -E, -C, -DPOCO_NO_GCC_API_ATTRIBUTE + -DPOCO_NO_WINDOWS_H true