1. 06 Nov, 2020 1 commit
    • Hans Johnson's avatar
      ENH: Prevent cmake in source builds (#1091) · 8954092f
      Hans Johnson authored
      
      * ENH: Prevent cmake in source builds
      
      Building directly inside the root of the source tree
      can cause problems where the build intermediate files
      overwrite or conflict with the intended source code
      files.
      
      This modification identifies this problem and
      issues failure messages and suggestions to over
      come the problem with more robust build suggestion.
      Co-authored-by: default avatarJordan Bayles <jophba@chromium.org>
      Unverified
      8954092f
  2. 26 Sep, 2020 1 commit
  3. 20 Jul, 2020 1 commit
  4. 13 Jul, 2020 1 commit
    • Chen's avatar
      Enhance cmake script (#1197) · cfc1ad72
      Chen authored
      * BUILD_TYPE corresponds to Release/Debug
         but LIB_TYPE corresponds to shared/static.
      
      * Add support to build shared, static and object lib at the same time.
      Unverified
      cfc1ad72
  5. 30 Apr, 2020 2 commits
  6. 28 Apr, 2020 5 commits
    • Joel Johnson's avatar
      Use non-version checked add_compile_options · 524234e4
      Joel Johnson authored
      Commit aebc7faa added version checks for CMake compatibility. In reality,
      only the add_compile_definitions need the check - add_compile_options
      itself has been supported since 3.0. Tested and confirmed built
      successfully with CMake 3.8.0.
      524234e4
    • Joel Johnson's avatar
      Always use consistent CXX_STANDARD · 12ceb014
      Joel Johnson authored
      Since CMake has subdirectory variable scope, unilaterally set the
      CMAKE_CXX_STANDARD variable to use C++11. This covers cases with the
      library being included externally, both in cases of only C++98 being
      specified, as well as later versions being specified (since the
      CXX_STANDARD itself isn't a library dependency, only the PUBLIC
      target_compile_features on jsoncpp_lib). The previous direct check for
      C++98 is handled by requiring C++11 on this library; should the
      compiler being used not support C++11 then CMake will issue an error.
      12ceb014
    • Joel Johnson's avatar
      Not needed to specify CMAKE_MACOSX_RPATH · edc6239f
      Joel Johnson authored
      As of CMake 3.0 with CMP0042, MACOSX_RPATH is enabled by default.
      Since the validated version used by jsoncpp is later than 3.0,
      this is already covered.
      edc6239f
    • Joel Johnson's avatar
      5a0152ae
    • Joel Johnson's avatar
      Don't use unique variable for postfix · a3afd74b
      Joel Johnson authored
      The more general CMake way to handle library suffixing is to set
      CMAKE_<CONFIG>_POSTFIX, so setting the Debug output suffix name should
      be more correctly done by the caller or CMake configurer by setting
      the desired value in CMAKE_DEBUG_POSTFIX.
      a3afd74b
  7. 13 Feb, 2020 1 commit
  8. 07 Jan, 2020 1 commit
    • David Seifert's avatar
      Meson updates (#1124) · 6bc55ec3
      David Seifert authored
      * Modernize meson.build
      
      * Make tests optional
      * Use `files()` for quick sanity checks
      
      * Bump version to 1.9.3
      
      * Bump SOVERSION, as some functions were removed
        and structs were changed, as determined by
        libabigail.
      6bc55ec3
  9. 23 Dec, 2019 1 commit
    • theirix's avatar
      Add option JSONCPP_WITH_EXAMPLE (#1099) · 7e5485ab
      theirix authored
      * Add option JSONCPP_WITH_EXAMPLE
      
      Allows to conditionally build examples as
      it has been done for tests.  Useful for packaging.
      
      * Do not build example by default
      7e5485ab
  10. 17 Oct, 2019 1 commit
  11. 17 Sep, 2019 1 commit
    • dota17's avatar
      Create an example directory and add some code examples. (#944) · e9ccbe01
      dota17 authored
      * update example directory
      
      * modify some compile error.
      
      * update with clang-format
      
      * update
      
      * update
      
      * add_definitions("../include/json")
      
      # Please enter the commit message for your changes. Lines starting
      # with '#' will be ignored, and an empty message aborts the commit.
      #
      # Date:      Wed Jul 10 21:26:16 2019 +0800
      #
      # On branch code_example
      # Your branch is up-to-date with 'origin/code_example'.
      #
      # Changes to be committed:
      #	modified:   example/CMakeLists.txt
      #
      
      * change CMakeLists.txt
      
      * update streamWrite.cpp
      
      * update
      
      * Update readFromStream.cpp
      
      * fix typo
      e9ccbe01
  12. 14 Aug, 2019 1 commit
    • Jordan Bayles's avatar
      Cleanup versioning strategy relanding (#989) (#997) · 7b28698c
      Jordan Bayles authored
      * Cleanup versioning strategy
      
      Currently, versioning is a mess. CMake and Meson have seperate build
      version number storage locations, with no way of knowing you need to
      have both. Plus, due to recent revisions the amalgamate script is broken
      unless you build first, and may still be broken afterwards.
      
      This PR fixes some issues with versioning, and adds comments clarifying
      what has to be done when doing a release.
      
      * Run clang format
      
      * Update SOVERSION....
      Unverified
      7b28698c
  13. 31 Jul, 2019 1 commit
  14. 22 Jul, 2019 1 commit
    • Jordan Bayles's avatar
      Cleanup versioning strategy (#989) · 12325b81
      Jordan Bayles authored
      * Cleanup versioning strategy
      
      Currently, versioning is a mess. CMake and Meson have seperate build
      version number storage locations, with no way of knowing you need to
      have both. Plus, due to recent revisions the amalgamate script is broken
      unless you build first, and may still be broken afterwards.
      
      This PR fixes some issues with versioning, and adds comments clarifying
      what has to be done when doing a release.
      
      * Run clang format
      
      * Update SOVERSION....
      Unverified
      12325b81
  15. 28 Jun, 2019 1 commit
  16. 03 Jun, 2019 2 commits
  17. 23 Mar, 2019 1 commit
  18. 18 Jan, 2019 2 commits
  19. 14 Jan, 2019 1 commit
    • Hans Johnson's avatar
      ENH: Refactor and enhance the CI testing infrastructure · a3c8e86c
      Hans Johnson authored
      1) Improve travis build script for use outside travis.
         Allow the script used for CI builds to also be used
         locally in a similar manner to the CI use of the scrips
      
      2) Add ctest compatible testing and CDASH support
         Report testing and building results to
         https://my.cdash.org/index.php?project=jsoncpp
      
         NOTE: The new ctest infrastructure is not yet robust on winodws
               Do no yet enable the new features for running test with ctest
               on windows platform.  The previous behaviors are maintainted,
               but enhance test reporting from windows is not yet supported.
      
      3) Add a cmake coverage testing option
         Ensure that cmake builds on linux are tested.
         Ensure that code coverage is reported.
      
      4) Move conditional environment checking into the matrix
         Avoid multiple places where conditional logic is used to
         change compiler behavior.  As more test environments are
         created fromt the travis.yml matrix, all settings should be
         obvious from that one location.
      
      5) Tests with known regressions from the jsonchecker are suppressed
          Tests that are known to pass with jsoncpp more lenient
          syntax enforcement are exluded from tests in test/runjsontests.py
      a3c8e86c
  20. 30 Dec, 2018 3 commits
  21. 03 Dec, 2018 2 commits
  22. 17 Apr, 2018 1 commit
  23. 05 Apr, 2018 1 commit
  24. 20 Dec, 2017 1 commit
  25. 28 Aug, 2017 1 commit
  26. 27 Aug, 2017 1 commit
    • Christopher Dunn's avatar
      1.8.2 <- 1.8.1 · 13b5ed72
      Christopher Dunn authored
      Soon, I hope to drop the cmake stuff and let meson handle
      the version numbers.
      13b5ed72
  27. 26 Jun, 2017 1 commit
  28. 10 Mar, 2017 2 commits
  29. 14 Dec, 2016 1 commit
    • Christopher Dunn's avatar
      Require cmake>=3.1 · f700fe45
      Christopher Dunn authored
      Plus some other build-related changes. I don't think there is anything
      functionally different from 1.7.7, or even any binary incompatibilities, but
      the cmake change is significant.
      f700fe45