RepoMirrors
/
cJSON
mirror of https://github.com/DaveGamble/cJSON
1
0
Fork 0
Code Issues Releases Wiki Activity
353 Commits 11 Branches 47 Tags 6.9 MiB
Commit Graph

353 Commits

Author SHA1 Message Date
Max Bruckner 4703f01cf4 Make/CMake: Fix use of compiler flags 
CMake: Option was not enabled by default as intended.
Makefile: Flags were not passed when building the tests
 2016-11-26 22:09:20 +07:00
Max Bruckner d0a9f46888 Release v1.0.2 2016-11-25 08:22:41 +07:00
Max Bruckner 23b269d5f9 Rename bool -> cjbool, fix #71 2016-11-25 08:19:18 +07:00
Max Bruckner 11fd27ade7 Change version to 1.0.1 2016-11-20 01:08:54 +07:00
Max Bruckner 65ac0a1a2b cJSON_Utils tests: fix formatting 2016-11-19 17:50:01 +07:00
Max Bruckner 679004914f Define a boolean type 
This is not changing the behavior of the code, but it is improving the
readability and helps to make the intention clearer.

One thing to take care: 'true' should never be compared against.
 2016-11-19 17:29:22 +07:00
Max Bruckner b88da9b0de Initialize all variables 2016-11-19 17:29:21 +07:00
Max Bruckner a5ff796c20 Replace 0 with more expressive NULL or '\0' 2016-11-19 17:28:14 +07:00
Max Bruckner d47339e274 cJSON_Utils: Fix comparing of cJSON_ types 
When comparing the type, it has to be masked with 0xFF because of
cJSON_IsConst and cJSON_IsReference.
 2016-11-18 22:52:52 +07:00
Max Bruckner aafb64a1c5 Merge pull request #66 from DaveGamble/v1 
Release version 1.0.0
 2016-11-17 08:19:08 +07:00
Max Bruckner 3a2151d267 README: Document ENABLE_CUSTOM_COMPILER_FLAGS 2016-11-15 20:23:47 +07:00
Max Bruckner f2cb5e4dd4 CMake: ENABLE_CUSTOM_COMPILER_FLAGS option 2016-11-15 20:21:57 +07:00
Max Bruckner 46a3a102d5 CMake: Fix indentation 2016-11-15 20:21:30 +07:00
Max Bruckner 1f3b95e2b1 README: Compiles on FreeBSD 2016-11-15 20:19:02 +07:00
Max Bruckner 706636fb20 Replace -ansi with -std=c89 for better compatibility 2016-11-15 20:03:11 +07:00
Max Bruckner a22da43578 README: More formatting 2016-11-15 08:12:35 +07:00
Max Bruckner df1ffa1e0b README: Building 2016-11-15 02:01:38 +07:00
Max Bruckner 501be02690 README: Reformat 2016-11-15 00:29:23 +07:00
Max Bruckner 778bcd1a62 Makefile: Redo with library versioning 
And remove special handling of SunOs
 2016-11-14 22:52:44 +07:00
Max Bruckner 46ff20c8b0 cJSON.h: add stddef.h because of size_t 2016-11-14 22:25:16 +07:00
Max Bruckner 5cca67e3fc CMake: Build tests by default 2016-11-14 19:36:04 +07:00
Max Bruckner dc4b62915a fix #10, now failing on incorrect escape sequences 2016-11-14 19:33:03 +07:00
Max Bruckner afd690d1c9 format fix 2016-11-14 19:14:14 +07:00
Max Bruckner cfd0fb83d3 CMake: Fix warning on Cygwin 2016-11-14 19:14:14 +07:00
Max Bruckner c213f2eb58 cJSON: Option to disable exporting targets 
This can be disabled when the exporting of the targets causes problems.
 2016-11-14 19:14:13 +07:00
Max Bruckner 5838e279a5 CMake: Use CMAKE_C_FLAGS instead of add_compile_options 
This is for compatibility reasons with old CMake 2.8 versions.
 2016-11-14 19:14:13 +07:00
Max Bruckner 966646d70e CMake config: Add CJSON_INCLUDE_DIR 2016-11-14 19:14:13 +07:00
Max Bruckner 58b76b518a CMake: Fix export of targets 
The prior approach was exporting paths from the build environment.
 2016-11-14 19:14:13 +07:00
Max Bruckner 8a838b37e3 CMake: Use standard variables for the version 2016-11-14 19:14:12 +07:00
Max Bruckner de992ec3c9 pkg-config: Add URL and link math library 2016-11-14 19:14:12 +07:00
Max Bruckner f9ce93029a Buildsystem: Fix paths 
Fix library and include paths in pkg-config, CMakeLists.txt and the
CMake config files.
 2016-11-14 19:14:12 +07:00
Markus Blatt 251e5a5e34 Added rudimentary package configuration files. 
These files will allow cmake based projects to find the
library using find_package(cJSON). If successful, they can
use CJSON_LIBRARIES and CJSON_INCLUDE_DIRS.

Other build systems can use a similar approach to pkg-config:
cmake --find-package -DNAME=cJSON -DCOMPILER_ID=GNU -DLANGUAGE=C  -DCMAKE_PREFIX_PATH=<path-to-non-sytem-installation-path> -DMODE=LINK

or with MODE COMPILE or EXISTS.
 2016-11-14 19:14:12 +07:00
Max Bruckner 8a7f9a2101 CMake: Use the GNUInstallDirs module 2016-11-14 19:14:12 +07:00
Max Bruckner 78cdb0d6ec CMake: Quote all variables 2016-11-14 19:14:11 +07:00
Max Bruckner b2283dab87 CMake: Use CMAKE_CURRENT_SOURCE/BINARY_DIR 2016-11-14 19:14:11 +07:00
Max Bruckner 3353062fc8 CMake: Make building of cJSON_Utils optional 
Turned off by default.
 2016-11-14 19:14:11 +07:00
Max Bruckner 97b255c736 CMake: Fix installation of libcjson_utils.pc 2016-11-14 19:14:11 +07:00
Max Bruckner fad10d5b1e Update list of contributors 2016-11-14 19:14:11 +07:00
Max Bruckner 302c574e00 CMake: Add compiler options only for Clang and GCC 2016-11-14 19:14:10 +07:00
Max Bruckner 576d9bb24f CMake: Only one project 2016-11-14 19:14:10 +07:00
Max Bruckner 47841ed3a7 CMake: Build test by default 2016-11-14 19:14:10 +07:00
Max Bruckner c3fecc2d07 CMake: Build shared libraries by default 
This is also what other projects are doing.
 2016-11-14 19:14:10 +07:00
Max Bruckner 9acd1c6e7e Add list of contributors 2016-11-14 19:14:10 +07:00
Max Bruckner aee8cb9231 pkg-config: Add libcjson_utils.pc 2016-11-14 19:14:09 +07:00
Max Bruckner 3d546c7036 pkg-config: Update libcjson.pc.in 2016-11-14 19:14:09 +07:00
Paulo Antonio Alvarez d5baeff85f Add pkg-config file support for libcjson 
We configure and install a pkg-config file so that our compilation and
linking flags can be more easily found using pkg-config.
 2016-11-14 19:14:09 +07:00
Max Bruckner 32a9870786 CMake: Separate so version for cJSON_Utils 2016-11-14 19:14:09 +07:00
Max Bruckner fd38fb712d CMake: Add compile options 2016-11-14 19:14:09 +07:00
Max Bruckner ba6389291f CMake: Set library version 2016-11-14 19:14:08 +07:00
Max Bruckner ba593394d4 CMake: Change include directory cJSON -> cjson 2016-11-14 19:14:08 +07:00