Permalink
Commits on Jan 28, 2014
  1. Merge pull request #161 from JoakimSoderberg/cmake_travis

    Add CMake build to Travis config.
    akheron committed Jan 28, 2014
  2. Merge pull request #160 from JoakimSoderberg/cmake_memcheck_fix

    Fix so that valgrind checks actually works with CMake.
    akheron committed Jan 28, 2014
  3. Fix so that valgrind checks actually works with CMake.

    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.
    JoakimSoderberg committed Jan 28, 2014
  4. Merge pull request #159 from JoakimSoderberg/config_fix

    Make sure the private config is included.
    akheron committed Jan 28, 2014
  5. Update copyrights for 2014

    akheron committed Jan 28, 2014
  6. Merge pull request #157 from JoakimSoderberg/cmake_config_new

    Cmake config
    akheron committed Jan 28, 2014
Commits on Jan 27, 2014
  1. Renamed config.h -> jansson_private_config.h

    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.
    JoakimSoderberg committed Jan 13, 2014
Commits on Jan 24, 2014
  1. Added CMake config files.

    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.
    JoakimSoderberg committed Jan 10, 2014
Commits on Jan 16, 2014
  1. Fix CMake build flags for MinGW

    akheron committed Jan 16, 2014
Commits on Dec 28, 2013
  1. Merge pull request #151 from nmlgc/master

    Check for key == NULL in json_object_get and json_object_del
    akheron committed Dec 28, 2013
Commits on Dec 27, 2013
  1. Merge branch '2.5'

    akheron committed Dec 27, 2013
Commits on Dec 13, 2013
  1. Merge branch '2.5'

    akheron committed Dec 13, 2013
  2. Merge

    akheron committed Dec 13, 2013
  3. Merge branch '2.5'

    akheron committed Dec 13, 2013
Commits on Dec 4, 2013
Commits on Nov 14, 2013
  1. Merge branch '2.5'

    akheron committed Nov 14, 2013
Commits on Oct 15, 2013
  1. Fix an off-by-one error

    akheron committed Oct 15, 2013
  2. Don't call strlen twice

    Oops.
    akheron committed Oct 15, 2013
Commits on Oct 4, 2013
  1. Merge pull request #143 from chipdude/master

    paper bag bug: json_string_set* functions should set the length too
    akheron committed Oct 4, 2013
  2. in simple string tests, always check lengths too

    Chip Salzenberg committed Oct 4, 2013
Commits on Oct 1, 2013
  1. Merge pull request #142 from chipdude/master

    fix type mismatch anywhere int != int32 (Vorne)
    akheron committed Oct 1, 2013
Commits on Sep 30, 2013
  1. fix type mismatch anywhere int != int32 (Vorne)

    Chip Salzenberg committed Sep 30, 2013
  2. Clarify json_string_length doc

    akheron committed Sep 30, 2013
  3. load.c: Change an error message

    akheron committed Sep 30, 2013