Commit Graph

254 Commits

Author SHA1 Message Date
Francis ANDRE
e59f37318e Add /MP option and remove /Gm as it is ignored and will be removed 2019-12-07 19:11:24 +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
Aleksandar Fabijanic
231ef2762d
Preserve entries order in DynamicStruct #2410 (#2413)
* Preserve entries order in DynamicStruct #2410

* disable C++11 default

* ifdef C++11 code
2018-08-01 08:06:59 -07:00
Francis ANDRE
b2c569ec0b Merge remote-tracking branch 'origin/poco-1.9.1' into poco-1.9.1-remove-wintestrunner 2018-06-20 12:00:19 +02:00
Francis ANDRE
5dbb9cc3de Regenerating VisualStudio projects 2018-06-20 09:47:40 +02:00
Francis ANDRE
b7330492e5 Add <TargetMachine>MachineX64</TargetMachine> on <Lib> element 2018-06-15 14:28:43 +02:00
Alex Fabijanic
f06580611f Stringify escapes every unicode symbol when object contain an array #2364 2018-06-12 10:17:08 -05:00
Francis ANDRE
19eecbaafb Remove WinTestRunner 2018-06-10 19:46:19 +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
Francis ANDRE
4c22b871ae Use CppUnit as a Poco module: regenerate all VS projects 2018-05-28 23:29:12 +02:00
Francis ANDRE
db5d570f33 Add Poco as prefix of CppUnit import libs 2018-05-28 19:58:05 +02:00
Francis ANDRE
be79688077 Use PocoCppUnit instead of CppUnit 2018-05-25 14:05:00 +02:00
zosrothko
960ecb38f0 Poco 1.9.1 assert true (#2255)
* Rename assert by assertTrue

* Update submodules

* Missing assertTrue

* Rename poco_assertTrue to poco_assert

* Rename poco_assertTrue to poco_assert
2018-03-29 11:12:54 -06:00
Günter Obiltschnig
5a1bf5eb4a fixed GH #2249: Poco::JSON::Object::set() should return reference to this to allow chaining 2018-03-27 11:47:05 +02:00
Günter Obiltschnig
009b459622 regen project files 2018-03-07 12:54:30 +01:00
Günter Obiltschnig
7eb1325bba style fixes 2018-03-05 15:05:04 +01: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
Conor Burgess
2632f34e85 Stricter JSON standard conformance (#2153) 2018-02-13 07:26:20 -06:00
Conor Burgess
bdd0478ead Fix nullptr deref in Poco::JSON::Object (#2150) 2018-02-09 10:18:23 -06:00
Alex Fabijanic
fc47df04cd #2142 #2137 cherry pick 3 2018-02-08 20:01:36 -06:00
Alex Fabijanic
fac2437fab fix toJSON function and some VS warnings 2018-02-08 19:46:02 -06:00
Aleksandar Fabijanic
fbd229ee4a #2142 #2137 cherry pick 2 2018-02-08 19:45:37 -06:00
Aleksandar Fabijanic
bd81aec779 #2142 #2137 cherry pick 1 2018-02-08 19:41:44 -06:00
Alex Fabijanic
03daed2230 ifdef closing coment fix 2018-01-31 20:58:38 -06:00
Alex Fabijanic
66f122b35f clang compile 2018-01-31 19:34:43 -06:00
Alex Fabijanic
e143bdce35 remove includes (already included in header) 2018-01-31 18:52:33 -06:00
Alex Fabijanic
02aa9262fe remove old pdjson header VS projects entries 2018-01-31 18:39:55 -06:00
Alex Fabijanic
e8be21dc66 Poco1.8.1 compilation error for C++98 mode #2121 2018-01-31 18:32:15 -06:00
Günter Obiltschnig
6e89a241e8 revert last change 2018-01-02 12:52:47 +01:00
Günter Obiltschnig
6774b5deb6 merge JSON fix from develop 2018-01-02 12:12:59 +01:00
Guenter Obiltschnig
c672c14e5a remove duplicate files and remaining Id headers 2017-11-10 09:26:24 +01:00
Alex Fabijanic
18c3ed3941 change json_error_s into function 2017-11-09 07:04:27 -06:00
Alex Fabijanic
94ef939f93 remove _CRT_SECURE_NO_WARNINGS from JSON.progen and regenerate JSON VS projects 2017-11-08 17:53:40 -06:00
Alex Fabijanic
21b2dfa944 replace strerror 2017-11-08 17:51:59 -06:00
Francis ANDRE
5591d10a21 Merge remote-tracking branch 'origin/poco-1.8.0' into poco-1.8.0 2017-10-31 18:11:51 +01:00
Alex Fabijanic
ba876aa4cd fix JSON windows compile 2017-10-31 12:06:18 -05:00
Guenter Obiltschnig
d172273a75 remove remaining $Id$ tags from file headers 2017-10-31 16:01:51 +01:00
zosrothko
f2e58c17e8 Add Gradle build scripts. 2017-10-31 09:07:53 +01:00
Alex Fabijanic
71946d9d18 move pd_json headers to src 2017-10-06 09:56:13 -05:00
Alex Fabijanic
7943d95b31 pd_json.h is missing when installed via CMake in 1.8.0 #1923 2017-10-06 09:22:55 -05:00
Alex Fabijanic
fab661a4a3 fix linux build 2017-09-27 13:03:29 -05:00
Alex Fabijanic
1054c46f6c compile pdjson as C++; disarm some windows warnings 2017-09-27 11:51:43 -05:00
Alex Fabijanic
6bcd362c74 use _snprintf_s on VS < 2015 2017-09-27 11:25:43 -05:00
Pascal Bach
f26cebc309 JSON: Fix missing objects with pd_json and CMake (#1908)
Seems it got lost during the backport to 1.8.0
2017-09-27 09:47:12 -05:00
Alex Fabijanic
fabfb4f068 updte json makefile 2017-09-25 16:28:26 -05:00
Alex Fabijanic
6efab2cd58 back-port JSON and accompanying Foundation portions (JSONString, Dynamic::Var etc) 2017-09-25 15:15:05 -05:00
Günter Obiltschnig
04e7e04d4d Remove \$Id`$ headers 2017-09-09 11:14:06 +02:00
Guenter Obiltschnig
f10d3a28f3 added Visual Studio 2017 project files 2017-02-20 16:20:16 +01:00
Guenter Obiltschnig
bd82bb1306 minor improvements to documentation and style 2017-02-13 22:33:48 +01:00
Guenter Obiltschnig
bfdf04ca72 fixed GH #1521: bug in JSON ParseHandler.cpp (empty keys should be valid) 2016-12-29 11:22:16 +01:00
Guenter Obiltschnig
075cfeb4cb fix uninitialized member in ctor 2016-09-26 18:12:56 +02:00
Guenter Obiltschnig
08e4f6af17 doc fixes 2016-08-28 17:17:56 +02:00
Günter Obiltschnig
f9f4c54bc3 fixed GH #1355: [JSON::Object] After copy-ctor, JSON::Object::_keys still points to keys in map of copied object 2016-08-27 10:54:35 +02:00
Guenter Obiltschnig
0ec65720ab removed unused #include 2015-09-30 10:31:50 +02:00
Guenter Obiltschnig
e25a17030d integrated CMake improvements from develop (GH #946) 2015-09-26 11:11:23 +02:00
Aleksandar Fabijanic
4f885a8b66 Change in JSON::Object::set(key,value) behavior in 1.6.1 #933
fix according to [suggestion](fee347ec6a (commitcomment-13196733))
2015-09-12 13:19:28 -05:00
Guenter Obiltschnig
468f2e029b fix for NumberParser changes 2015-09-11 08:17:57 +02:00
Aleksandar Fabijanic
26e76482c5 Change in JSON::Object::set(key,value) behavior in 1.6.1 #933 2015-09-11 07:46:54 +02:00
Guenter Obiltschnig
87f0bac343 fix for VS2008 2015-08-03 07:33:37 +02:00
Günter Obiltschnig
4f0b692d66 added project and solution files for VS2015 2015-08-01 10:29:32 +02:00
Alex Fabijanic
5a5509a3e3 fixed GH #782 and #819 2015-06-09 22:41:38 -05:00
Aleksandar Fabijanic
3553a86d60 JSON Stringifier fails with preserve insert order #819 2015-05-14 22:12:52 -05:00
Alex Fabijanic
fea66f4dbc Poco::JSON::PrintHandler not working for objects in array #766 2015-03-31 21:35:34 -05: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
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
10ef2b2335 CMake: Remove WinDriver usage in tests
Add WinCEDriver to packages supporting it
2014-12-21 16:23:35 +01:00
Guenter Obiltschnig
931a5a5252 Removing support for Visual Studio.NET 2003 and Visual Studio 2005 - it's time to say goodbye to the past 2014-12-15 11:05:13 +01:00
Günter Obiltschnig
bc0978d01e fixed GH #471: vs2010 release builds have optimization disabled
fixed GH #616: Visual Studio warning C4244
2014-11-20 21:22:52 +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
Alex Fabijanic
102413aed5 clang build fixes 2014-10-11 18:48:00 -05:00
Alex Fabijanic
ff07ee1c6e an attempt to reproduce GH #491 2014-10-11 18:25:32 -05:00
Günter Obiltschnig
6fe2e4fb11 VS project files: do not share intermediate directory between projects in same folder 2014-10-06 13:51:49 +02:00
Guenter Obiltschnig
f2512856ee added Var::isBoolean() and fixed JSON stringifier 2014-09-18 20:57:34 +02:00
rafzi
a787b4f898 fix JSON stringify to escape special characters
When converting from non string types the converted string was not escaped
2014-09-06 19:42:06 +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
Günter Obiltschnig
30bb18f394 added VS2013 project/solution files for Windows Embedded Compact 2013 2014-08-09 10:49:04 +02:00
Guenter Obiltschnig
3f5e9bd247 fixed testsuite 2014-07-16 16:14:41 +02:00
Alex Fabijanic
32d4c1eb07 GH #482: Poco::JSON::Stringifier::stringify bad behaviour 2014-07-10 21:00:59 -05:00
Pascal Bach
16e8ed8ab5 cmake: JSON cleanup
- explicitly list files

Reviewed-by: Roger Meier <r.meier@siemens.com>
2014-07-10 09:15:06 +02:00
Pascal Bach
975c30faf0 Add CTests for all components 2014-06-17 11:30:03 +02:00
Alex Fabijanic
5cd3e842e8 added '/' to the characters escaped in JSON 2014-05-28 21:05:30 -05:00
Alex Fabijanic
b2eb4fda59 GH #176: Poco::JSON::Stringifier UTF encoding 2014-05-27 22:23:10 -05:00
Kontinuation
de0147fbf0 added test case for the newly added JSON::Array::set function 2014-05-23 21:56:00 +08:00
Kontinuation
5a07343bd6 Merge remote-tracking branch 'upstream/develop' into develop 2014-05-23 03:02:45 +08:00
Kontinuation
1b5f9cb079 style fixes 2014-05-23 02:38:57 +08:00
Kontinuation
3880f76d82 fixed array element updating problem in JSONConfiguration 2014-05-23 02:22:06 +08: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
Roger Meier
b0581433a7 LICENSE: add info about SPDX-License-Identifier usage and use it
fix: remove executable flag and change back to 100644 (was 100755)

Signed-off-by: Roger Meier <r.meier@siemens.com>
2014-05-14 08:38:09 +02:00
Roger Meier
628a06f718 LICENSE: add info about SPDX-License-Identifier usage and use it
Signed-off-by: Roger Meier <roger@bufferoverflow.ch>
2014-05-04 21:02:42 +02:00
Alex Fabijanic
6ec4986fb1 GH #379: Remove unnecessary null pointer checks 2014-04-29 22:26:30 -05:00
Alex Fabijanic
8a9e7792d9 - fixed GH #362: Defect in Var::parseString when there is no space between value and newline
- fixed GH #314: JSON parsing bug
- added GH #313: MetaColumn additions for Data::ODBC and Data::SQLite
2014-04-29 21:25:30 -05:00
Alex Fabijanic
4d366250e1 fixed GH #410: Bug in JSON::Object.stringify() in 1.5.2 2014-04-28 21:43:57 -05:00
Guenter Obiltschnig
e044d77717 Merge branch 'develop' of https://github.com/pocoproject/poco into develop 2014-04-23 13:30:51 +02:00
Guenter Obiltschnig
f8169eabac updated SDK in WEC2013 project files 2014-04-23 13:30:27 +02:00
Günter Obiltschnig
85873d02c9 re-generated VS2013 testsuite projects without MFC 2014-04-21 22:10:34 +02:00
Günter Obiltschnig
12c7bb562d re-generated vs100-vs120 project files 2014-04-21 10:50:51 +02:00
Günter Obiltschnig
b2ba1dfb74 -added Windows Embedded Compact 2013 support 2014-03-17 14:36:17 +01:00
Aleksandar Fabijanic
1cd745996c Merge pull request #315 from fbraem/develop
Solve wrong escaping of unicode characters
2014-03-11 20:29:18 -05:00
Patrick White
69f7cb9846 Fix warnings in headers because application/user settings control what warnings are seen when compiling against poco 2014-01-23 16:22:38 -05:00