Commit Graph

44 Commits

Author SHA1 Message Date
Günter Obiltschnig
a3d827d80e remove ENABLE_MSVC_MP cmake option 2020-02-17 08:36:04 +01:00
Günter Obiltschnig
4de9a21187 make CMake files style (more) consistent 2020-02-14 11:07:32 +01:00
Günter Obiltschnig
75a86ad868 remove POCO_STATIC 2020-02-12 22:10:01 +01:00
Scott Talbert
48cb7ba8a3 Use ${LIB_SUFFIX} when setting PocoConfigPackageLocation 2020-02-06 15:17:57 -05:00
Günter Obiltschnig
58e63be162 #2894: Poco 1.10.0 doesn't build with cmake & POCO_UNBUNDLED 2020-02-04 11:05:21 +01:00
Joerg-Christian Boehme
b9fa82b08b
CMake merge from devel to 1.10 to use embedded OpenSSL for Windows (#2767)
* Add  embedded openssl for windows
* Add windows fix for OpenSSL #2708
* Fix CppUnit lib prefix with Poco
2019-09-02 11:48:01 +02:00
Transporter
edb8bed56d Copy of pr #2694 for poco-1.10.0 including fix for #2718 2019-06-12 14:10:21 +02:00
Joerg-Christian Boehme
86b448ecf5 First update of android build notes 2019-05-30 08:32:03 +02:00
Joerg-Christian Boehme
e1435a6620
Fix cross-compilation against Poco pre-built (#2599) (#2679)
* Use ZLIB and PCRE imported target to improve portability
* Set EXPAT and SQLite3 library for XML and SQL if POCO_UNBUNDLED is true in cmake build
2019-04-22 23:47:11 +02:00
Joerg-Christian Boehme
eec8dedbb8
Merge cmake changes from develop (#2504)
* Increase PostgreSQL version number

* Take changes from develop for Define Platform Specific cmake

* Take changes from develop for find MySQL modul

* Take changes from develop for find ODBC modul

* Cleanup standard language compile features

* Fix cmake compile features

* Improve to find ODBC on windows

* Enable 64-bit build on AppVeyor

* Switch MySQL off on AppVeyor because of error LNK2038: mismatch detected for _MSC_VER: value 1800 doesnt match value 1900

* Move LCC define to MySQL
2018-10-18 07:07:46 +02:00
Joerg-Christian Boehme
e624b3315c
CMake improve find third-party libraries (#2478)
* Improve find thirdparty cmake module. Cleanup cmake build system

* Add additional settings for thirdparty paths and fix windows build

* Improve cmake getting started doc

* Fix postgresql build

* Add additional path for odbc windows kits
2018-10-10 13:43:34 +02:00
Joerg-Christian Boehme
b7ac69ebc6 Add iODBC include path (#2414) 2018-08-07 12:47:02 -05:00
Joerg-Christian Boehme
612f092235 Cleanup cmake build system to use transitive dependency management from cmake (#2321)
* Some cleanup in the root CMakeLists.txt

* Cleanup cmake targets

* Add find openssl modul for older cmake version

* Set proper scope

* Change crypto default to off

* Fix openssl default to on

* Remove global setting of C99 standard

* Set from C11 to C99

* Fix for NetSSL win build

* Set C99 compile features

* Fix Windows build

* Fix windows build

* Cleanup poco unbundle definition

* Fix PDF build

* Remove unused set affinity

* Add _CRT_SECURE_NO_WARNINGS as target compile definitions

* Add _AFXDLL as target compile definitions

* Remove commented out line

* Refactor add_definitions to target_compile_definitons in Util

* Refactor add_definitions to target_compile_definitons in XML

* Remove THREADSAFE in data sql cmake build

* Refactor add_definitions to target_compile_definition in cmake mysql

* Refactor add_definitions to target_compile_definition in cmake odbc

* Refactor add_definitions to target_compile_definition in cmake sqlite

* Refactor add_definitions to target_compile_definitions in platform specific cmake

* Add _DEBUG as compile definition

* Add build dependencies between Foundation-testrunner and TestApp, TestLibrary in cmake build

* Use cmake property to build shared libs

* Cleanup POCO_NO_AUTOMATIC_LIBS. Set only for Windows in cmake build system

* cleanup LIB_MODE_DEFINITIONS in cmake buld system

* Add POCO_STATIC for CppUnit

* Cleanup target link libraries and add option dependencies.

* Add dependencies management in cmake

* Update cmake documentation

* Squashed commit of the following:

commit 38c233f93fc8e9ad6e24d686c905eb18c86e19a7

    Fix "invalid new-expression of abstract class type ApacheServerRequest" (#2231)

    - abstract method "bool secure() const" defined in HTTPServerRequest was implemented in ApacheServerRequest, one of its derived classes
     - a ap_log_error had one of its parameters changed for fixing a warning "passing NULL to non-pointer argument"
     - minor indentation problems corrected

commit 4cbdfbe828943871618172f9e042176f115d61d8

    Fix build dependencies

* Improve database cmake build dependencies

* Update doc

* Update doc

* Update cmake build commands

* Set public on target link libraries in cmake build system

* Fix PostgreSQL build

* Fix PostgreSQL build in cmake

* Fix PostgreSQL from SQL to Data

* Squashed commit of the following:

commit 1ba7d5dcbfb8d07860dd4efda33b31bedf6184c4

    Add missing cmake file

* Set path to PostgresSQL in AppVoyer

* Try to fix AppVeyor build

* show dir in appvoyer

* Disable PostgreSQL build on Appvoyer

* Refactor add_definitions to target_compile_definitions
2018-06-03 11:17:50 -05:00
Jörg-Christian Böhme
c481702911 On android: show SDK version, show files on emulator when test is failling, exclude unknown failing Foundation test 2018-05-20 05:43:55 +02:00
Joerg-Christian Boehme
e57301529f Fix timeout on android tests 2018-03-22 09:55:16 +01:00
Jörg-Christian Böhme
63b95fd4aa Fix ClassLoader and SharedLibrary test for android (#2209) 2018-03-19 07:54:58 +01:00
Joerg-Christian Boehme
73897b4357 Add POCO_OS_ANDROID as platfrom definitons (#2186)
* Add POCO_OS_ANDROID as platform definition

* Ignore test big ping when its failing
2018-02-26 19:18:45 -06:00
Joerg-Christian Boehme
9feabc7723 Add android build on travis (#1981)
* Add build for android in travis CI.

* Fix review findings. Change from __ANDORID__ to POCO_ANDROID

* Add android test

* Fix compile issue after rebase

* Ignore test big ping when its failing
2018-02-26 18:54:40 -06:00
Raphael Freudiger
1dc38d8500 respect lib suffix when installing cmake files
Some cmake files contain pathes to the lib directory with suffix.
So they should respect the suffix as well.
2018-02-19 10:26:45 +01:00
Günter Obiltschnig
26fe80e995 #1991 2017-12-18 10:33:11 +01:00
Guenter Obiltschnig
c672c14e5a remove duplicate files and remaining Id headers 2017-11-10 09:26:24 +01:00
Joerg-Christian Boehme
c6e1a0137b Verify in cmake if it possible to compile with C++yy standard 2017-11-08 09:25:06 +01:00
Joerg-Christian Boehme
c7bf9d936a Add support for MariaDB client in cmake build system (#1972) 2017-11-02 15:04:58 -05:00
Alex Fabijanic
87ec631b4a try to fix clang build (use libc++) 2017-10-24 21:03:08 -05:00
Alex Fabijanic
e4b8aa5967 increase cmake compiler versions for CXX1x 2017-10-24 17:58:06 -05:00
Alex Fabijanic
dea76c8e2e add CXX1x compiler capability detection to cmake 2017-10-24 13:52:12 -05:00
Josh Blum
7dc24a2561 replace dl library with CMAKE_DL_LIBS
Some platforms do not have -ldl, specifically in this case freebsd.
The CMAKE_DL_LIBS is part of standard cmake and is supported
in the cmake_minimum_required() in the top level CMakeLists.txt
CMAKE_DL_LIBS will be -ldl on platforms that support it, or empty.
2017-03-14 12:58:54 -07:00
Günter Obiltschnig
3d1a094725 Merge pull request #1026 from zosrothko/Cygwin
Fixes for producing the poco-1.6.2 release on a Cygwin x86 platform
2016-02-28 15:29:08 +01:00
Josh Blum
df8b868da6 minor change to support cmake2.8 builds
Reduce cmake version requirement to 2.8.12 (ubuntu trusty),
and conditionalize export() in PocoMacros to support 2.8 syntax.
2015-12-14 17:32:18 -08:00
FrancisANDRE
603e43ee7d Revert "Revert "avoid running SharedMemoryTest when POCO_NO_SHAREDMEMORY is defined.""
This reverts commit e1c0db371d.
2015-11-10 14:19:06 +01:00
FrancisANDRE
e1c0db371d Revert "avoid running SharedMemoryTest when POCO_NO_SHAREDMEMORY is defined."
This reverts commit 7d7bbfe5b2.
2015-11-10 14:11:08 +01:00
FrancisANDRE
7d7bbfe5b2 avoid running SharedMemoryTest when POCO_NO_SHAREDMEMORY is defined.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2015-11-10 14:09:53 +01:00
Guenter Obiltschnig
e25a17030d integrated CMake improvements from develop (GH #946) 2015-09-26 11:11:23 +02:00
Sascha Zelzer
25d3f4ccd4 Use correct locations for the generated Poco*ConfigVersion.cmake files. 2015-02-04 04:35:56 +01:00
Sascha Zelzer
10425a9556 Do not overwrite CMAKE_PREFIX_PATH in component config files.
This fixes problems when a project adds a directory to
CMAKE_PREFIX_PATH, then calls find_package(Poco ...) and afterwards
calls find_package() for another project located in one of the
directories of the original CMAKE_PREFIX_PATH variable.
2015-02-04 04:35:23 +01:00
Pascal Bach
61cdbf0b16 CMake: Remove PocoConfig.cmake as proper *Config.cmake files are now generated on a per component when built with CMake.
resolves: #677

Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
2015-01-27 16:00:34 +01:00
Pascal Bach
f778e67430 CMake: Improve installation and package generation
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
2015-01-27 15:52:18 +01:00
Pascal Bach
b69fafb84c CMake: Create PocoConfig.cmake to make importable from other CMake projects
The generated PocoConfig.cmake can be used by other CMake projects using find_package.
2014-10-14 17:58:46 +02:00
Pascal Bach
c8a96c9247 CMake: Add macro to help generate Packages from Poco 2014-10-14 17:58:46 +02:00
Pascal Bach
7950001803 cmake: Cleanup CMakeLists.txt for all components
- Add missing CMakeLists.txt
- Use POCO_ macros to improve code structure in XCode/VisualStudio
- Better ODBC detection
- Remove unnecessary commented out code

The CMake documentation recommends explicitly listing source files, but because CMake is not the primary build system GLOB patterns are used for the moment.
2014-08-22 17:11:03 +02:00
Pascal Bach
65fcaf65a0 cmake: Rework top level CMake file
- Allow enable/disable components
2014-08-22 17:11:03 +02:00
Pascal Bach
2be8dc0fee cmake: add find modules for PCRE and SQLite3
Reviewed-by: Roger Meier <r.meier@siemens.com>
2014-07-10 09:15:06 +02:00
Taylor Braun-Jones
f0e894ff10 Check for ODBC headers in addition to checking for odbc_config tool 2013-09-11 09:20:13 -06:00
Mathäus Mendel
dc9aafa7a1 Moved contributed CMake modules to "cmake" folder
By convention CMake project files are placed on a folder called "cmake" and then called from the build system by appending the CMAKE_MODULE_PATH variable
2012-12-16 00:40:40 -02:00