aboutsummaryrefslogtreecommitdiff
path: root/CMakeLists.txt
AgeCommit message (Collapse)AuthorFilesLines
2016-09-18jansson 2.9v2.9Petri Lehtinen1-2/+2
2016-09-11Add install targets to be optionalMatthew Johnston1-0/+3
2016-08-30jansson 2.8v2.8Petri Lehtinen1-2/+2
2016-05-30Simplify snprintf and vsnprintf checking for Visual StudioPetri Lehtinen1-10/+0
2016-02-10Fix libdir is wrong when compile with cmakeThanabodee Charoenpiriyakij1-23/+10
because JANSSON_INSTALL_LIB_DIR is set to /usr/local/lib after foreach loop
2015-01-13Compile simple_parse example for CMake project.Joakim Soderberg1-1/+6
2014-12-19Increase test coveragePetri Lehtinen1-2/+6
2014-12-18Make it possible to set initial hashtable sizePetri Lehtinen1-0/+2
Fixes #213.
2014-12-12Add support for coverage/coveralls.io in cmake project.Joakim Söderberg1-2/+37
This adds support for http://coveralls.io/ to the cmake project. This can then be run via a new Travis job, which uploads json containing the coverage data to the website. To use this, please login usin github at http://coveralls.io/ and enable the Jansson project. You can then get a nice percentage badge for code coverage after each Travis buid. Coveralls will also comment on pull request with coverage info. To test and run it locally do: ```bash $ mkdir build && cd build $ cmake -DJANSSON_COVERALLS=ON -DCMAKE_BUILD_TYPE=Debug .. $ cmake --build . # $ make $ cmake --build . --target coveralls # $ make coveralls ``` There is also another script that generates a local HTML page using lcov CodeCoverage.cmake which can be run using ```bash $ make coverage ``` The required depdencies to run this are: gcov curl lcov (is needed for the normal CodeCoverage script)
2014-10-13Fix CFLAGS for static-CRT build.Christian Ullrich1-2/+2
Setting the variables to only "/MT(d)" resets all other flags to their defaults, so the debug build used release flags.
2014-10-13Fix static CRT selection.Christian Ullrich1-1/+1
2014-10-02jansson 2.7v2.7Petri Lehtinen1-2/+2
2014-07-02CMake: Use add_definitions for compiler flagsPetri Lehtinen1-1/+1
Fixes #193.
2014-04-30Merge branch '2.6'Petri Lehtinen1-2/+28
2014-04-30Check uint16_t and uint8_t support correctlyPetri Lehtinen1-2/+28
Fixes #177.
2014-02-12Make valgrind happyv2.6Petri Lehtinen1-0/+2
2014-02-12Fix feature checks to use correct __ATOMIC flagsPetri Lehtinen1-1/+1
2014-02-12Make valgrind happyPetri Lehtinen1-0/+2
2014-02-12Fix feature checks to use correct __ATOMIC flagsPetri Lehtinen1-1/+1
2014-02-11Merge branch '2.6'Petri Lehtinen1-12/+54
2014-02-11jansson 2.6Petri Lehtinen1-2/+2
2014-02-11CVE-2013-6401: Change hash function, randomize hashesPetri Lehtinen1-10/+39
Thanks to Florian Weimer and Eric Sesterhenn for reporting, reviewing and testing.
2014-01-28Fix so that valgrind checks actually works with CMake.Joakim Soderberg1-9/+25
The valgrind tests where not run on the suites. And valgrind was always returning 0 so set an explicit exit code on exit. I also had forgotten to change the name of TEST_WITH_VALGRIND to JANSSON_TEST_WITH_VALGRIND so that the tests would never use valgrind.
2014-01-28Make sure the private config is included.Joakim Soderberg1-1/+5
2014-01-27Renamed config.h -> jansson_private_config.hJoakim Soderberg1-6/+7
This is because it's really easy to get a name collission if compiling Jansson as a subproject in a larger CMake project. If one project includes several subprojects each having their own config.h, this will cause the wrong file to be loaded.
2014-01-24Added CMake config files.Joakim Soderberg1-71/+157
This will simplify linking against the lib, both from the build-tree and install-tree from other CMake projects. CMakes find_package command uses these configs to locate the exported targets for the library. * Also changed so that all CMake options for the project are prepended with JANSSON_ so that there is no ambiguity when including this as a subdirectory in another CMake project.
2014-01-16Fix CMake build flags for MinGWPetri Lehtinen1-2/+2
2013-09-19jansson 2.5v2.5Petri Lehtinen1-2/+2
2013-06-25Update CMakeLists.txtcryptobiote1-5/+5
2013-06-20Adding option for MSVC for those who are linking statically.cryptobiote1-1/+16
2013-06-02Adjust CMakeLists.txt and .def: add _d postfix onto jansson_d.lib/dllPaul Harris1-0/+8
Had to remove the "LIBRARY" line from jansson.def, which was optional, and was overriding CMake's desire for a specific name.
2013-05-06Create and install the pkg-config file jansson.pc for CMake.Joakim Soderberg1-3/+23
Use the same jansson.pc.in file as the ./configure script does to generate the jansson.pc file for pkg-config. Also make an install rule for this.
2013-04-24Added more detailed CMake documentation.Joakim Soderberg1-37/+83
- Also added better FindSphinx support so that we can detect the version and not have a fatal error if it's too old. - Added support for building latex documentation with -DBUILD_LATEX. Off by default. - Added suppor for building man pages with -DBUILD_MAN. On by default (unless sphins is too old to support it).
2013-04-18Use -fPIC when possible.Joakim Soderberg1-0/+4
So that we can link the library statically to shared libraries.
2013-03-14Remove trailing whitespacePetri Lehtinen1-28/+28
2013-03-14cmake: Add stripped testsPetri Lehtinen1-0/+4
2013-03-07Moved *config.h.cmake to the cmake directory.Joakim Soderberg1-2/+2
2013-03-07Skip using a debug postfix with visual studio.Joakim Soderberg1-4/+0
The output dir is different anyway, and this just makes it more complicated to build projects that link to this, because they need different link rules based on the build type.
2013-03-07Compile tests by default.Joakim Söderberg1-38/+48
- Encourage actually using the unit tests by compiling them by default. Set the WITHOUT_TESTS variable to build without instead... - Changed comments to keep within 80 characters. - Don't have a hard coded path for valgrind, simply assuem it's in the path instead (an OSX ports install puts it in /opt/local/bin for instance). - Fixed building the shared lib.
2013-03-07Consolidated the CMake project.Joakim Soderberg1-7/+109
- Moved everything to one CMakeLists.txt - Added support for the json_process test suites (instead of just the API tests). - Changed to use the modified json_process version that does away with the environment variables (originally written by DanielT). - Had to exclude "test_memory_funcs" on MSVC, since void pointer arithmetics are not allowed as it is done in secure_malloc and secure_free. - Had to add a check for "ssize_t". This is not available on Windows and maybe on some other platforms (used in test_pack.c) - Result from running ctest (The failure seems unrelated to CMake, it's just that the expected result is in a different order): 99% tests passed, 1 tests failed out of 121 Total Test time (real) = 1.31 sec The following tests FAILED: 24 - valid__complex-array (Failed)
2013-03-07Fixes for cmake for MSVC2010Paul Harris1-3/+3
2013-03-07Add CMake build system.Paul Harris1-0/+276
Added multiple CMake-related files to project. Supports building the library and the tests. See CMakeLists.txt for notes on how it works. I had to adjust 3 existing files in order to disable some configuration that should be taken care of by cmake/automake anyway. I also added jansson.def from a future jansson version, to test cmake's support for .def files (which works fine).
generated by cgit v1.1 at 2024-09-10 13:48:08 +0000