Commit Graph

35 Commits

Author SHA1 Message Date
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
Brice Gros
990f7825b5 Fix path to DLLVersion.rc and enable to skip Foundation; Fix Foundation samples referencing useless libs 2019-10-18 15:35:02 +02:00
Günter Obiltschnig
9a8ab0858f include version resource in DLLs built with CMake 2019-06-24 15:39:06 +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
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
Alex Fabijanic
dc021ae25c Postgres Linux and cmake build 2018-05-07 11:50:39 -05:00
Guenter Obiltschnig
e25a17030d integrated CMake improvements from develop (GH #946) 2015-09-26 11:11:23 +02: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
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
0fd90ec722 cmake: Data cleanup
- explicitly list files
- use find_package for MySQL and ODBC
- remove unused code
- remove unnecessary include dirs
- support unbundled SQLite3
- replace tabs by spaces

Reviewed-by: Roger Meier <r.meier@siemens.com>
2014-07-10 09:15:06 +02:00
Josh Blum
f442148670 poco: library install dirs per RUNTIME/LIBRARY/ARCHIVE
For a unix system, this commit implies no changes by default. However, the ${LIB_SUFFIX} convention was added so the build can be configured for a red-hat style installation which uses lib64 by specifying cmake -DLIB_SUFFIX=64

For a windows build (msvc), this commit will cause the .dll files to be installed in the bin/ path; import libraries .lib are still installed in the lib/ path. Installing dlls into the bin path is preferable because dlls must be in the executable %PATH% to be found at runtime, as there is not equivalent of a separate library path as there is on unix.
2014-05-21 14:16:34 -07:00
Sergei Nikulov
dec6bc3918 cmake: added /bigobj option for msvc 2014-02-22 23:31:23 +04: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
5a639074d9 change EOL to 'native' 2012-04-29 18:52:25 +00:00
Aleksandar Fabijanic
d75e68c027 new trunk (base for 1.5)
windows build only
2012-04-23 01:14:34 +00:00
Aleksandar Fabijanic
f9b60296f7 removing old trunk files 2012-04-23 00:43:14 +00:00
Marian Krivos
218b06621d trunk: split cmake debug/optimize build 2 2012-01-08 19:10:15 +00:00
Marian Krivos
b59d198396 cmake build system cleanup 2012-01-08 09:37:13 +00:00
Marian Krivos
7cb622a445 trunk: split cmake debug/optimize build 2012-01-07 13:45:03 +00:00
Marian Krivos
eb266f8a57 Set cmake produced shared libraries numbering to standard scheme (trunk = 12)
Sync latest Foundation changes from 1.4.2
2011-09-15 08:31:51 +00:00
Marian Krivos
0ac146cb9e cmake improvements: test and samples are from now disabled by default, you can enable this option with cmdline option to cmake: '-DENABLE_TESTS=1'
minimum required CMAKE version is 2.6 from now
2011-01-22 11:46:03 +00:00
Marian Krivos
96b0296969 cmake + MinGW32: fix for ignored ODBC 2011-01-16 13:36:24 +00:00
Marian Krivos
c5b2daa36c cmake build system fix - debug version of ther library was striped and vice versa 2009-08-26 12:26:22 +00:00
Marian Krivos
56c8ac698e bugfix: #2809750 (iodbc on OSX) 2009-06-22 18:41:44 +00:00
Marian Krivos
1afd0a8328 bugfix #2781776 - cmake instals .svn directories 2009-04-27 19:22:30 +00:00
Marian Krivos
aaa3b1b274 Fix for 64bit linux - size_t isn't always Poco::UInt32 2009-03-08 18:57:55 +00:00
Marian Krivos
c4f6084c25 added last Poco module to cmake infrastructure - PocoODBC (working at least on linux32 + unixodbc + gcc 4.3.2) 2009-03-08 17:03:18 +00:00
Marian Krivos
ac01609444 cmake scripts for all tests 2009-02-21 20:19:53 +00:00
Marian Krivos
129f21cc79 added Data, Foundation, Net and Util samples + some global cmake fixes 2009-02-19 20:35:03 +00:00
Marian Krivos
16cdb4b127 cmake runtime install support (headers+libs) 2009-02-18 20:47:32 +00:00
Marian Krivos
5b320c2894 Very basic but functional (at least on linux with gcc) support
for CMake build system
. 
It is strongly recomended to use out-of-source build to preserve
original Poco makefiles.

http://www.cmake.org/Wiki/CMake_FAQ#Out-of-source_build_trees

I have tested unix makefile generating and Eclipse CDT4 generating.

Supported are static/dynamic and debug/release targets. 
On now only core libs are included: CppUnit, Foundation,
Data, Data/SQLite, Util, Net and XML. But autodetection
of OpenSSL, MySQL and ODBC is working OK already.

CPack and CTest nor library install still doesn't work, only building.

This is only the start.
2009-02-15 15:49:19 +00:00