Skip to content

Commit

Permalink
Merge c76ee11 into c80d70e
Browse files Browse the repository at this point in the history
  • Loading branch information
@agarny
agarny committed May 15, 2020
2 parents c80d70e + c76ee11 commit 2b2283b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion doc/downloads/index.js
View file
Expand Up @@ -40,7 +40,7 @@ var jsonData = { "versions": [
{ "change": "<strong>Python support:</strong> make it possible to retrieve the type of a <code>DataStoreVariable</code> object (see issue <a href=\"https://github.com/opencor/opencor/issues/2336\">#2336</a>)." },
{ "change": "<strong>CellML Annotation view:</strong> use the new <a href=\"https://identifiers.org/\">identifiers.org</a> platform (see issue <a href=\"https://github.com/opencor/opencor/issues/2190\">#2190</a>)." },
{ "change": "<strong>Simulation Experiment view:</strong> fixed a couple of GUI glitches (see issue <a href=\"https://github.com/opencor/opencor/issues/2332\">#2332</a>)." },
{ "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"https://libgit2.github.com/\">libgit2</a> to version 0.99.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2305\">#2305</a>). Upgraded <a href=\"https://riverbankcomputing.com/software/qscintilla/intro\">QScintilla</a> to version 2.11.4 (see issue <a href=\"https://github.com/opencor/opencor/issues/2307\">#2307</a>). Upgraded <a href=\"https://mesa3d.org/\">Mesa</a> to version 20.0.2 (see issue <a href=\"https://github.com/opencor/opencor/issues/2311\">#2311</a>). Upgraded <a href=\"https://llvm.org/\">LLVM</a>+<a href=\"https://clang.llvm.org/\">Clang</a> to version 10.0.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2314\">#2314</a>). Upgraded the <a href=\"https://computation.llnl.gov/projects/sundials\">SUNDIALS</a> library to version 5.2.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2322\">#2322</a>). Upgraded the <a href=\"https://openssl.org/\">OpenSSL</a> library to version 1.1.1g (see issue <a href=\"https://github.com/opencor/opencor/issues/2326\">#2326</a>). Upgraded <a href=\"https://jquery.com/\">jQuery</a> to version 3.5.1 (see issue <a href=\"https://github.com/opencor/opencor/issues/2338\">#2338</a>)." }
{ "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"https://riverbankcomputing.com/software/qscintilla/intro\">QScintilla</a> to version 2.11.4 (see issue <a href=\"https://github.com/opencor/opencor/issues/2307\">#2307</a>). Upgraded <a href=\"https://mesa3d.org/\">Mesa</a> to version 20.0.2 (see issue <a href=\"https://github.com/opencor/opencor/issues/2311\">#2311</a>). Upgraded <a href=\"https://llvm.org/\">LLVM</a>+<a href=\"https://clang.llvm.org/\">Clang</a> to version 10.0.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2314\">#2314</a>). Upgraded the <a href=\"https://computation.llnl.gov/projects/sundials\">SUNDIALS</a> library to version 5.2.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2322\">#2322</a>). Upgraded the <a href=\"https://openssl.org/\">OpenSSL</a> library to version 1.1.1g (see issue <a href=\"https://github.com/opencor/opencor/issues/2326\">#2326</a>). Upgraded <a href=\"https://jquery.com/\">jQuery</a> to version 3.5.1 (see issue <a href=\"https://github.com/opencor/opencor/issues/2338\">#2338</a>). Upgraded <a href=\"https://libgit2.github.com/\">libgit2</a> to version 1.0.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2340\">#2340</a>)." }
]
},
{ "major": 0, "minor": 5, "patch": 0, "day": 15, "month": 10, "year": 2016, "type": 0, "license": 1,
Expand Down
26 changes: 13 additions & 13 deletions src/plugins/thirdParty/libgit2/CMakeLists.txt
View file
Expand Up @@ -3,21 +3,21 @@ project(libgit2Plugin)
# Name and version of our package

set(PACKAGE_NAME libgit2)
set(PACKAGE_VERSION 0.99.0)
set(PACKAGE_VERSION 1.0.0)

# Version of our library

set(MAJOR_LIBRARY_VERSION 0)
set(MINOR_LIBRARY_VERSION 99)
set(MAJOR_LIBRARY_VERSION 1)
set(MINOR_LIBRARY_VERSION 0)
set(LIBRARY_VERSION ${MAJOR_LIBRARY_VERSION}.${MINOR_LIBRARY_VERSION}.0)

# Git tag for our library

set(GIT_TAG v0.99.0-opencor)
set(GIT_TAG v1.0.0-opencor)

# Release tag

set(RELEASE_TAG v0.99.0-opencor)
set(RELEASE_TAG v1.0.0-opencor)

# Specify where our local package will be installed

Expand Down Expand Up @@ -65,31 +65,31 @@ if(USE_PREBUILT_LIBGIT2_PACKAGE)
if(WIN32)
if(RELEASE_MODE)
retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 83be0066937098f8da6123c7f18fade9b957b0cb
${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 3289b243874b50e814f144fdd3557027a970c851
RELEASE_TAG ${RELEASE_TAG}
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES 997164fe937b185fd46a21ef85da2cee29e67d06
SHA1_VALUES 5bcd488901c23ca7be89ff6bfb7ee2eccee8927c
e293290b23506370386dbcb97fbe091bd798dcda)
else()
retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} d2c1e4567ae15480b83283f08f63a7ce00c84d19
${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} d3bd3cb515a8902f69323f8371ec816095308b4b
RELEASE_TAG ${RELEASE_TAG}
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES d0ab7e154973c61b2f924ba1a0311b92af1f5053
SHA1_VALUES c6bd3de9a60954413f7139ebb26e9bcaa370700e
63265399b64faf3e5a4da412f7023570b3d207fc)
endif()
elseif(APPLE)
retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 9d460a3097cb1c8230f9c3df19e6fcc78eb8b0c1
${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 2122a45d2901788ea68401369e08533d745aaec6
RELEASE_TAG ${RELEASE_TAG}
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES 6d9b97f836f534aecd0d9753c7ec0366af274555)
SHA1_VALUES 57170bbed86dded8f44550ea0fabc9aa69c70d73)
else()
retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 33143ba020dec1d2a495a11d8b897af2b8b762f4
${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} fac45b9682960e8e901d9df5bfc81c3995ac2c35
RELEASE_TAG ${RELEASE_TAG}
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES 7f7aa0d387a053729d61801ca8aa87049f523079)
SHA1_VALUES c8623552989b96ca9e72e8516205c71e2b051ad3)
endif()
else()
# Ignore some warnings
Expand Down

0 comments on commit 2b2283b

Please sign in to comment.