generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2024-12-12 18:10:27 +01:00
Code Issues Projects Releases Wiki Activity
370 Commits 2 Branches 55 Tags 9 MiB
4ca9d25ccc
Commit Graph

370 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Dunn
4ca9d25ccc Revert "Merge pull request #108 from open-source-parsers/quote-spaces" 
This reverts commit dfc5f879c1, reversing
changes made to 0f6884f771.
 2015-01-09 22:28:20 -06:00
Christopher Dunn
6eaf150dc7 Merge pull request #109 from open-source-parsers/double-string-double 
Double string double
 2015-01-06 12:54:39 -06:00
Christopher Dunn
8b489f891a 1.1.0 <- 1.0.0 2015-01-06 12:46:17 -06:00
Christopher Dunn
65cee6ea16 fix double->string->double round-trip (bump minor ver.) 
See #98.
  http://stackoverflow.com/questions/747470/what-is-the-meaning-of-numeric-limitsdoubledigits10/16941784#16941784
 2015-01-06 12:40:36 -06:00
Christopher Dunn
dfc5f879c1 Merge pull request #108 from open-source-parsers/quote-spaces 
quote cmdline arg
 2015-01-06 12:14:48 -06:00
Christopher Dunn
1a4dc3a888 quote cmdline arg 
See #99.
 2015-01-06 12:11:12 -06:00
Christopher Dunn
0f6884f771 Merge pull request #106 from Gachapen/fix_cmake_install 
Fix cmake_package install being broken because of wrong include path.
 2015-01-06 11:50:13 -06:00
Magnus Bjerke Vik
748328a0d1 Fix cmake_package install being broken because of wrong include path. 
The TARGET_INCLUDE_DIRECTORIES from inside the
IF(JSONCPP_WITH_CMAKE_PACKAGE) block was removed, since it only needs to
be set once.

In addition the CMAKE_VERSION check was simplified.
 2015-01-06 09:51:44 +01:00
Christopher Dunn
f44278cd4e Merge pull request #101 from dominicpezzuto/master 
Fix build issues related to Solaris and older GCC
 2015-01-03 14:45:41 -06:00
dominicpezzuto
d2b6992f3e Fix build issues related to Solaris and older GCC 
Fixed two build issues:
 - JsonCPP currently doesn’t compile for Solaris due to platform
differences with ‘isfinite’ function.  Fixed by adding proper include
and define for Solaris.
 - JsonCPP currently doesn’t compile for GCC version 4.1.2 and earlier
due to use of ‘-Werror=*’ compile flag, which was introduced in a later
version.  Fixed by adding version check to only add this flag on
supported versions of GCC.
 2014-12-27 16:45:40 -05:00
dominicpezzuto
54764dd85b Fix build issues related to Solaris and older GCC 
Fixed two build issues:
 - JsonCPP currently doesn’t compile for Solaris due to platform
differences with ‘isfinite’ function.  Fixed by adding proper include
and define for Solaris.
 - JsonCPP currently doesn’t compile for GCC version 4.1.2 and earlier
due to use of ‘-Werror=*’ compile flag, which was introduced in a later
version.  Fixed by adding version check to only add this flag on
supported versions of GCC.
 2014-12-27 16:44:26 -05:00
Christopher Dunn
8dd32e1e2e Merge pull request #94 from Gachapen/cmake_target_include 
CMake: Add include directory to jsoncpp_lib target

Well-researched. Passes Travis CI.
 2014-12-24 01:30:13 -06:00
Magnus Bjerke Vik
3fd7f8b470 CMake: Only add include directory to jsoncpp_lib target if CMake version supports the command. 2014-12-16 08:58:52 +01:00
Magnus Bjerke Vik
e99e6d9cc6 CMake: Add include directory to jsoncpp_lib target so that it can be easier used with other projects. 2014-12-03 15:42:41 +01:00
Christopher Dunn
9ca1aaab14 Merge pull request #93 from akien-mga/master 
Small packaging improvements
 2014-12-02 00:40:08 -06:00
Rémi Verschelde
27639ce578 Add support for BUILD_SHARED_LIBS argument 
BUILD_SHARED_LIBS is a standard CMake argument that serves the purpose
of the custom JSONCPP_LIB_BUILD_SHARED. For now we force JSONCPP_LIB_BUILD_SHARED
to true if BUILD_SHARED_LIBS was defined.
Workaround for #51.
 2014-12-01 23:47:21 +01:00
Rémi Verschelde
f8a3a599ac Adapt libdir for 64bit RPM-based distros 
RPM-based distros such as Fedora or Mageia put 64bit libraries in /usr/lib64
while 32bit libraries go to /usr/lib. This is usually taken into account
in CMake projects using a LIB_SUFFIX parameter that can be set to "" or "64".
 2014-12-01 23:44:08 +01:00
Christopher Dunn
7165f6ac4c 1.0.0 2014-11-20 08:45:58 -06:00
Christopher Dunn
37a9fa9f9d 1.0.0 2014-11-20 00:20:51 -06:00
xiaoyur347
83683da13f fix gcc warning when CXXFLAGS contains '-Wextra' 
json_value.cpp:179:26: warning: enumeral and non-enumeral type in conditional expression [enabled by default]

https://github.com/open-source-parsers/jsoncpp/pull/84
 2014-11-19 23:59:34 -06:00
Christopher Dunn
e5de78db82 Merge pull request #87 from cdunn2001/master 
2to3 (but only the changes which should work with python2 also)
 2014-11-19 23:54:56 -06:00
Christopher Dunn
ffd7295ab8 simple 2014-11-19 23:35:56 -06:00
Christopher Dunn
433876866d ws 2014-11-19 23:34:15 -06:00
Christopher Dunn
bd1e895287 simple py3 changes 2014-11-19 23:30:47 -06:00
Christopher Dunn
9aa6144b2a python except as 2014-11-19 23:10:02 -06:00
Christopher Dunn
5fda247dab Merge pull request #79 from ya1gaurav/patch-2 
Remove gcc compilation warnings in json_reader.cpp
 2014-11-18 00:14:06 -06:00
Gaurav
767713be2b Remove gcc compilation warning in json_reader.cpp 
Submitting Patch for Issue : https://github.com/open-source-parsers/jsoncpp/issues/77
It will fix warnings in json_reader.cpp
 2014-11-17 14:04:03 +05:30
Aaron Jacobs
3e3a8d5bd2 Merge pull request #74 from ya1gaurav/master 
Prefer appending character constants over string literals.
 2014-11-14 10:39:03 +11:00
Gaurav
abc1e07543 Prefer appending character constants over string literals - correct patch. 
Submitting correct patch for https://github.com/open-source-parsers/jsoncpp/issues/61
 2014-11-13 12:47:19 +05:30
Christopher Dunn
00b0a1b992 Merge pull request #70 from jmesmon/pkg-config-include-var 
pkg-config: support INCLUDE_INSTALL_DIR
 2014-11-12 00:03:52 -06:00
Cody P Schafer
1fe6c59827 pkg-config: support INCLUDE_INSTALL_DIR 2014-11-11 16:09:05 -05:00
Aaron Jacobs
20672ed02c Merge pull request #68 from BillyDonahue/refactor_ctor_boilerplate 
Json::Value: Refactor common code in all constructors to an initBasic() function.
 2014-11-10 20:23:52 +11:00
Billy Donahue
8eb5d89db6 Remove initInt and initUInt until they are needed. 2014-11-10 01:35:42 -05:00
Christopher Dunn
9c80798038 Merge pull request #63/#67 from dreifachstein/master 
Allow customization of component install dirs
Passed Travis CI.
 2014-11-08 15:56:36 -06:00
Yu Xiaolei
72e5223658 Fix default runtime install dir 2014-11-05 13:18:16 +08:00
Yu Xiaolei
dc84d96a49 Add CMake package file generation support 2014-11-05 12:31:44 +08:00
Yu Xiaolei
1c3a20de50 Allow customization of component install dirs 2014-11-05 11:25:53 +08:00
Christopher Dunn
533dbe0898 Update README.md 
Note on C++11
 2014-11-03 12:39:01 -06:00
Christopher Dunn
6cb2f7bd65 Merge pull request #58 from autochthe/master 
Add public semantic error reporting
 2014-10-29 22:41:50 -05:00
Mara Kim
b84a39cae5 Add public semantic error reporting 
Closes open-source-parsers/jsoncpp#57
 2014-10-23 02:18:14 -05:00
Christopher Dunn
7bd75b0fb4 Merge pull request #55 from glehmann/build-env 
use the CXXFLAGS and LINKFLAGS environment variable in scons
 2014-10-21 12:38:05 -05:00
Gaëtan Lehmann
f74a4ff17a use the CXXFLAGS and LINKFLAGS environment variable in scons 
this allows homebrew to use its own flags during the build
 2014-10-21 11:43:53 +02:00
Aaron Jacobs
b7eccbb110 Merge pull request #54 from I3ck/master 
Updated documentation links to point to GitHub
 2014-10-20 22:06:26 +11:00
Martin Buck
ebe2d6e6ee Updated documentation links to point to GitHub 2014-10-20 07:59:44 +02:00
Christopher Dunn
4cd31f01bb Merge pull request #53 from I3ck/master 
Removed typo in README
 2014-10-13 07:24:07 -05:00
I3ck
ab19fa1d6f Removed typo in README 2014-10-13 12:17:53 +02:00
Christopher Dunn
bc8b5d871f Merge pull request #52 from cquammen/master 
Removed unneeded newlines from parsed comments
 2014-10-11 16:40:51 -05:00
Cory Quammen
fd06bfca79 Removed unneeded newlines from parsed comments 
Newlines from comments separated by lines are retained when comments
are appended, so adding a newline between separate comments for a
node is not needed.
 2014-10-09 16:33:29 -04:00
Cory Quammen
4d23492d11 Added printing of comments to *.actual test files 
This enables testing of comment-handling code. Updated *.expected test
result files to account for printing of comments.
 2014-10-09 16:33:29 -04:00
Christopher Dunn
aa650c5b9d Merge pull request #50 from sergzub/master 
CMake 2.8.5 or higher is required
 2014-10-05 12:04:46 -05:00