Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: open-source-parsers/jsoncpp
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: airtimemedia/jsoncpp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: develop
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 7 commits
  • 1 file changed
  • 3 contributors

Commits on Jun 12, 2023

  1. BXB-4250 Look for jsoncpp in media-deps (#1)

    @jasonshweiri
    jasonshweiri authored Jun 12, 2023
    Configuration menu
    Copy the full SHA
    229222b View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2023

  1. BXB-4250 Fix binary output dir (#2)

    @jasonshweiri
    jasonshweiri authored Jun 15, 2023
    Configuration menu
    Copy the full SHA
    6202da5 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2023

  1. BXB-4250 Look for jsoncpp in media-deps (#1)

    @jasonshweiri
    jasonshweiri authored and Matthew MacGregor committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    01eeedf View commit details
    Browse the repository at this point in the history

  2. BXB-4250 Fix binary output dir (#2)

    @jasonshweiri
    jasonshweiri authored and Matthew MacGregor committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    e0fc7d1 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2023

  1. BXB-4263 Enable CMake for jsoncpp 1.9.5 

    A change in jsoncpp's CMake file led to it naming the library targets
based off of the PROJECT_NAME variable. So this was incorrectly adding
the jsoncpp library target as "mediacore_lib" or something similar
depending on the top level directory. Manually setting this to jsoncpp
makes the library target created as expected. Additionally, a change led
to BUILD_SHARED_LIBS needing to be turned on manually.
    Matthew MacGregor committed Jun 17, 2023
    Configuration menu
    Copy the full SHA
    172e401 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. Merge branch 'develop' into feature/BXB-4263---Update-jsoncpp-upstream

    Matthew MacGregor committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    a58012e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4 from airtimemedia/feature/BXB-4263---Update-jso… 

    …ncpp-upstream

BXB-4263 Update jsoncpp upstream
    @MattMacGregor
    MattMacGregor authored Jun 20, 2023
    Configuration menu
    Copy the full SHA
    9c55b5f View commit details
    Browse the repository at this point in the history
Loading