Eric Haszlakiewicz
fe308b8862
Issue #626 : Restore compatibility with cmake 2.8 by adjusting quoting and explicitly defining the PROJECT_VERSION* variables.
5 years ago
Björn Esser
1e94da779a
CMake: Fix grammar: written -> wrote.
5 years ago
Björn Esser
61e2bae511
doc: Move Doxyfile into doc subdir
5 years ago
Björn Esser
8f3592b3d5
CMake: Fix out-of-tree build for Doxygen documentation.
5 years ago
Björn Esser
76dd99abb2
CMake: Re-format config-option block and re-order it alphabetically.
5 years ago
Björn Esser
78642dcb9b
CMake: Add an option to disable the use of thread-local storage.
Using thread-local storage may not be desired in all environments
and/or use-cases, thus there should be an option to disable its use
on purpose.
Fixes #451 .
5 years ago
Eric Haszlakiewicz
06742d6277
Issue #600 : don't rename the static library on Windows, it _needs_ to have a different name because the dll build also creates a "json-c.lib" file.
5 years ago
Eric Haszlakiewicz
4f43a077a4
Issue #598 : avoid building static libraries twice.
5 years ago
hofnarr
558ef8609c
cmake: change variable name
5 years ago
hofnarr
929d74512a
cmake: add list for build targets
5 years ago
dota17
e97fc20bfd
update
5 years ago
dota17
952db0f397
support to build both static and shared libraries
5 years ago
Eric Haszlakiewicz
00272292a7
The json_parse command line app doesn't build on Windows, disable it.
5 years ago
Eric Haszlakiewicz
55d053118e
Add an apps directory, and a json_parse program to parse an input file and report on memory usage.
This is intended to provide a way, during development, to test out the memory
and performance impacts of a change.
5 years ago
Eric Haszlakiewicz
fa6bc1e2d7
Issue #471 : always create directories with mode 0755, regardless of umask.
5 years ago
Eric Haszlakiewicz
8b511c402b
Issue #585 : don't install config.h
5 years ago
Eric Haszlakiewicz
2babb5b780
Update the master branch to version 0.0.14.99
5 years ago
Jehan
8c33d1c3c9
CMakeLists: do not enforce strict prototypes on Windows.
On Windows, or at least when cross-built with Mingw-w64, build fails
because strict prototype fails on an included file (thus nothing we can
do about in json-c code):
> from /home/jehan/dev/src/json-c/json_util.c:44:
> /home/jehan/.local/share/crossroad/roads/w64/json-c/include/minwindef.h:196:3: error: function declaration isn't a prototype [-Werror=strict-prototypes]
> 196 | typedef INT_PTR (WINAPI *FARPROC) ();
> | ^~~~~~~
> /home/jehan/.local/share/crossroad/roads/w64/json-c/include/minwindef.h:197:3: error: function declaration isn't a prototype [-Werror=strict-prototypes]
> 197 | typedef INT_PTR (WINAPI *NEARPROC) ();
> | ^~~~~~~
> /home/jehan/.local/share/crossroad/roads/w64/json-c/include/minwindef.h:198:3: error: function declaration isn't a prototype [-Werror=strict-prototypes]
> 198 | typedef INT_PTR (WINAPI *PROC) ();
> | ^~~~~~~
Let's just disable the errors for Windows build.
5 years ago
Björn Esser
053eaa61d7
Fix CMake tests for enforced strict prototypes.
5 years ago
Björn Esser
d0dc3489dc
Enforce strict prototypes.
5 years ago
Björn Esser
165e6f58fc
CMake: Install pkgconfig file in proper location by default
The default location for pkconfig files on most systems is:
${CMAKE_INSTALL_LIBDIR}/pkgconfig
Thus the file should get installed in there by default.
5 years ago
Björn Esser
78cd37fb18
Clean trailing white-space.
5 years ago
Björn Esser
e756777c92
CMake: Check whether BSYMBOLIC is supported by the linker.
Linking with '-Bsymbolic-functions' is supported for ELF-binaries, only.
5 years ago
Björn Esser
58670ec64e
CMake: Build Doxygen documentation out-of-tree.
5 years ago
Björn Esser
a989651bd4
CMake: Fix appending of linker flags.
There was a typo in `CMAKE_SHARED_LINKER_FLAGS`.
5 years ago
Eric Haszlakiewicz
545464322b
Issue #568 : fix the strtoll and strtoull handing so config.h ends up creating defines for those only when needed, which should exclude mingw environments.
5 years ago
Eric Haszlakiewicz
19bbf2c069
Add includes and split off json_types.h to help ensure that headers can be included in any order.
5 years ago
dota17
1204a1fded
modify the doc target message
5 years ago
Eric Haszlakiewicz
e94eb90f9f
Merge pull request #546 from dota17/make_unistall
Add uninstall target in cmake
5 years ago
dota17
c14c6caa32
delete -r in uninstall
5 years ago
Eric Haszlakiewicz
a8c9284f06
Merge pull request #547 from dota17/assert_test
modify json-c default build type, and fix up the assert() errors in t…
5 years ago
dota17
0030e905b4
modify RELEASE
5 years ago
dota17
e56ab0146f
update testcase and delete debug -O0 build
5 years ago
Eric Haszlakiewicz
737aee40c4
Merge pull request #542 from dota17/adduint64_final
add uint64 data to json-c
5 years ago
dota17
2d44f865c3
modify json-c default build type, and fix up the assert() errors in testcase
5 years ago
dota17
1160c8625c
Add uninstall target in cmake
5 years ago
dota17
e3b6521baa
add doc target on cmake
5 years ago
dota17
77d7a99c75
Increase distcheck target in cmake
5 years ago
dota17
3c3b5920f7
add uint64 data to json-c
5 years ago
Eric Haszlakiewicz
6c55f65d07
Set cmake policy CMP0075, to have check_include_file use the value of CMAKE_REQUIRED_LIBRARIES (currently, adds -lm). See issue #510 .
5 years ago
Eric Haszlakiewicz
11a638048d
Add a few missing features to the cmake setup that are present in configure.ac:
Include all compiler warnings, and provide DISABLE_WERROR to make them not be errors.
Define _REENTRANT, if setting it works.
Set -Bsymbolic-functions, and provide DISABLE_BSYMBOLIC to turn that off.
Implement the check for HAS_GNU_WARNING_LONG
5 years ago
Eric Haszlakiewicz
a92e6d2c28
Set the soversion in the cmake built library, and arrange for the file name to be generated appropriately too.
5 years ago
Eric Haszlakiewicz
41f434e89f
Fix test_util_file for VS2013 too, but skip all the tests for anything older than that because the limitations are too inconvenient.
5 years ago
Eric Haszlakiewicz
f19abcf981
Get the cmake build a bit closer to the autoconf one: include json_visit.h, and fix the version stamped in json-c.pc.
5 years ago
Eric Haszlakiewicz
bdaff94e9a
Build and run the tests as part of the cmake build.
5 years ago
myd7349
c2036ab9fc
Install CMake module files
6 years ago
Jehan
c46a0636c6
Installation directories empty with CMake in pkg-config.
CMake was not properly substituting the installation dir variables (they
ended up all empty), so the pkg-config results were also wrongs. For
instance cflags was: -I -I/json-c
Even though json-c was found at configure time, this obviously broke the
build of any application using it.
6 years ago
Eric Haszlakiewicz
6460446aa6
Switch to building a dynamic lib by default. Tweak language in the README.md slightly. Inspired by PR#452.
6 years ago
Ivan Romanov
ba5a02e8a9
Allow use json-c cmake as subproject
Now json-c can be bundled to any cmake-based project and used with
couple lines of code:
add_subdirectory(json-c EXCLUDE_FROM_ALL)
target_link_libraries(MyProject json-c)
7 years ago
Eric Haszlakiewicz
994e6c1f60
Re-add creation and installation of the json-c.pc file to the cmake build.
7 years ago