Commit Graph

73 Commits

Author SHA1 Message Date
Alex Fabijanic
2a80322ecb merge dev and resolve conflicts 2016-03-11 20:57:28 -08:00
Mathäus Mendel
ce8e88cc4b Fixed ${CMAKE_THREAD_LIBS_INIT} being empty during the compilation
The directive checking for the native threads library must be
called before everything else.
2016-03-11 10:35:23 -03:00
Alex Fabijanic
e388c9baa0 Merge branch 'develop' into pr/1113 2016-03-08 14:08:11 -08:00
Alex Fabijanic
3eb023132b Merge branch 'develop' into pr/1113
Conflicts:
	Foundation/testsuite/TestSuite_vs120.vcxproj
2016-03-07 21:38:26 -08:00
Mathäus Mendel
19d1657feb Fixed miscompilation due to missing libraries on AIX
Added the find_packages directive in the right place now.
2016-03-07 17:42:56 -03:00
FrancisANDRE
7f38fc4ef0 Add Data/PostgreSQL to CMake build
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-03-05 17:55:28 +01:00
FrancisANDRE
f1b88218f2 Fix naming of libs for CppUnit
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2016-01-08 09:05:47 +01:00
FrancisANDRE
abbbe614b8 Small correction
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2015-12-21 23:58:56 +01:00
FrancisANDRE
609072a5ad Add ENABLE_SAMPLES
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2015-12-21 23:38:38 +01:00
FrancisANDRE
bb1e1f053c Add ENABLE_SAMPLES
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2015-12-21 08:37:36 +01:00
FrancisANDRE
09ecc0a3eb Display ${CMAKE_CONFIGURATION_TYPES} & ${CMAKE_BUILD_TYPE}
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
2015-12-09 09:31:08 +01:00
fbraem
ae7c0c095a Add ENABLE_REDIS 2015-11-02 22:07:31 +01:00
Csaba Keszegh
61305c01ee fix: set public compiler flags on library targets
POCO_STATIC: has to be set when using poco as static library
POCO_NO_ATUMATIC_LIBS: CMake config module will find the correct libraries.
  Don't need to guess in headers.
2015-09-15 10:02:38 +02:00
Philip Miller
2efe9b05cb add option ENABLE_MSVC_MP for parallel MSVC builds 2015-06-02 12:04:31 -04:00
Pascal Bach
6fb5ecca03 Improve CMake handling of MD and MT
- Some other minor improvements

Contributed-by: Torndeco <torndeco.di@gmail.com>
2015-05-04 15:34:48 +02:00
franchuti688
ba8c37c31f adapted POCO C++ to biicode build system 2015-04-07 16:01:31 +02:00
Tim Kettler
a751d32602 Enable pocoproject to be built as a subproject in a cmake build. 2015-03-17 12:20:52 +01:00
Sascha Zelzer
9c0184337e Make regex compatible with VERSIONS like "1.6.0-all (2014-12-22)".
Without the fix, the patch number contained spaces which led to
errors on Linux with CMake because the generated symlinks contained
spaces.
2015-02-04 04:46:25 +01:00
Aleksandar Fabijanic
eb28010c16 remove deprecated mno-cygwin option #651, part II 2015-01-01 14:12:17 -06:00
Aleksandar Fabijanic
5424aade0e remove deprecated mno-cygwin option #651 2015-01-01 14:09:45 -06:00
xantares
345481a475 do not guess mingw include/link dirs
let cmake do the job as we dont want mingw headers to conflict with system headers and libs, they are provided in a separate tree
2014-12-22 19:12:41 +01:00
Guenter Obiltschnig
d247e1cf05 updated CHANGELOG; CMake fixes for OS X; doc updates; release script improvements 2014-12-22 00:06:53 +01:00
Pascal Bach
6f809f7acb CMake: Add support for PageCompiler and File2Page
Resolves: #649
2014-12-21 21:54:02 +01:00
Pascal Bach
739cd30487 CMake: Build PocoDoc using CMake 2014-12-21 16:23:35 +01:00
Pascal Bach
d9c0d2b495 CMake: Add support for CppParser 2014-12-21 16:23:34 +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
65fcaf65a0 cmake: Rework top level CMake file
- Allow enable/disable components
2014-08-22 17:11:03 +02:00
Pascal Bach
6f262da25c cmake: Add SQLite, MySQL and ODBC include directories to global include path 2014-07-13 17:54:05 +02:00
rafi
81a4487e20 cmake: Set an output directory for Windows DLLs 2014-07-11 20:44:49 +02:00
Pascal Bach
d334ef4fb0 cmake: read shared library version from libversion 2014-07-10 17:15:09 +02:00
Pascal Bach
82d329914b cmake: cleanup top CMake file
- use lower case commands
- use find_package(*) instead of include(Find*)
- rearange find_package commands closer to where they are used

Reviewed-by: Roger Meier <r.meier@siemens.com>
2014-07-10 09:15:06 +02:00
Pascal Bach
74397ccbe3 cmake: read the version information from VERSION
The version inforamtion for CMake is extracted from the VERSION file not hardcoded in CMakeLists.txt

Reviewed-by: Roger Meier <r.meier@siemens.com>
2014-07-10 09:15:06 +02:00
Csaba Keszegh
638b10856b fix: configure_file error if CMAKE_MODULE_PATH had multiple directories 2013-12-05 10:18:15 +01:00
Csaba Keszegh
8b3561a525 cmake: android support
Foundation/src/Error.cpp: ndk-r9 define _GNU_SOURCE in features.h but only the XSI-compliant strerror_r in string.h
2013-12-05 10:18:15 +01:00
Sascha Zelzer
aa0218fa9a Fix #279 by not checking CMAKE_BUILD_TYPE when setting CMAKE_DEBUG_POSTFIX.
CMAKE_DEBUG_POSTFIX is already build-type specific and only applied
in case of "Debug" builds. The build-type is correctly inferred from
either CMAKE_BUILD_TYPE for MAkefile based generators or the selected
build type in the Visual Studio IDE. This fix allows to switch the
build type in Visual Studio and have Poco compile/link correctly.
2013-09-01 11:20:45 +02:00
Marian Krivos
a33cc590a2 version bump 2013-06-12 18:13:44 +02:00
Marian Krivos
9349786415 cmake and gcc warning fixes 2013-02-19 06:16:12 +01:00
fbraem
f41e6f1b5b Add MongoDB 2013-02-16 20:53:48 +01: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
Mathäus Mendel
e3649153b8 Fixed build with CMake
Used CMAKE_DEBUG_POSTFIX instead LIB_EXT for library name decoration on debug builds (less intrusive and more flexible)
2012-12-08 15:54:38 -02:00
Aleksandar Fabijanic
6d2881ef34 Merge pull request #3 from RangelReale/mobilefixes
Android and iOS fixes
2012-12-02 20:28:22 -08:00
Rangel Reale
86b79a6dff * add POCO_STATIC definition in CMake
* Foundation must compile .mc file in CMake build
* Net must list all files in CMake build file
2012-11-11 14:17:28 -02:00
Rangel Reale
141a2c152c * use xcode-select to find correct paths for iOS build
* add iOS definitions for CMake
* ServerApplication on Android must use events instead of signals to wait for server termination.
2012-11-11 11:59:36 -02:00
Marian Krivos
bb1e8c1852 cmake: fix so version to 15 2012-09-23 17:19:50 +00:00
Marian Krivos
05ebb66609 added cmake support 2012-06-26 12:40:26 +00:00
Aleksandar Fabijanic
f9b60296f7 removing old trunk files 2012-04-23 00:43:14 +00:00
Marian Krivos
4e26485542 trunk" cmake fix for openssl include dir 2012-02-10 15:30:38 +00:00
Marian Krivos
ac73265fb3 trunk: cmake: added simple build script for building Release & Debug version at once 2012-02-07 13:56:54 +00:00
Marian Krivos
1d8e75687e cmake build: POCO_UNBUNDLED support for sqlite 2012-02-06 18:35:26 +00:00
Marian Krivos
8b70c37260 trunk: sync from 1.4.3
make & cmake fixes
2012-02-04 17:03:09 +00:00