Skip to content

Commit

Permalink
Merge b6a8cde into 0715bcf
Browse files Browse the repository at this point in the history
  • Loading branch information
@agarny
agarny committed Apr 22, 2019
2 parents 0715bcf + b6a8cde commit a47b4ef
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 36 deletions.
2 changes: 1 addition & 1 deletion doc/downloads/index.js
View file
Expand Up @@ -38,7 +38,7 @@ var jsonData = { "versions": [
],
"changes": [
{ "change": "<strong>General:</strong> now rely on <a href=\"https://visualstudio.microsoft.com/downloads/\">Visual Studio 2017 Update 9</a> to build OpenCOR on <a href=\"https://en.wikipedia.org/wiki/Microsoft_Windows\">Windows</a> (see issue <a href=\"https://github.com/opencor/opencor/issues/2041\">#2041</a>). Upgraded our minimum requirement to <a href=\"https://en.wikipedia.org/wiki/Ubuntu_version_history#Ubuntu_18.04_LTS_(Bionic_Beaver)\">Ubuntu 18.04 LTS</a> on Linux (see issue <a href=\"https://github.com/opencor/opencor/issues/2050\">#2050</a>)." },
{ "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"http://www.llvm.org/\">LLVM</a>+<a href=\"http://clang.llvm.org/\">Clang</a> to version 8.0.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2040\">#2040</a>). Upgraded <a href=\"https://github.com/fbergmann/libSEDML/\">libSEDML</a> to version 0.4.4 (see issue <a href=\"https://github.com/opencor/opencor/issues/2042\">#2042</a>). Upgraded <a href=\"https://www.mesa3d.org/\">Mesa</a> to version 18.3.5 (see issue <a href=\"https://github.com/opencor/opencor/issues/2044\">#2044</a>)." }
{ "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"http://www.llvm.org/\">LLVM</a>+<a href=\"http://clang.llvm.org/\">Clang</a> to version 8.0.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2040\">#2040</a>). Upgraded <a href=\"https://github.com/fbergmann/libSEDML/\">libSEDML</a> to version 0.4.4 (see issue <a href=\"https://github.com/opencor/opencor/issues/2042\">#2042</a>). Upgraded <a href=\"https://www.mesa3d.org/\">Mesa</a> to version 18.3.5 (see issue <a href=\"https://github.com/opencor/opencor/issues/2044\">#2044</a>). Upgraded <a href=\"http://sbml.org/Software/libSBML/\">libSBML</a> to version 5.18.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2064\">#2064</a>)." }
]
},
{ "major": 0, "minor": 5, "patch": 0, "day": 15, "month": 10, "year": 2016, "type": 0, "license": 1,
Expand Down
20 changes: 10 additions & 10 deletions src/plugins/thirdParty/libNuML/CMakeLists.txt
View file
Expand Up @@ -63,31 +63,31 @@ if(USE_PREBUILT_LIBNUML_PACKAGE)
if(WIN32)
if(RELEASE_MODE)
retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
${RELATIVE_PROJECT_SOURCE_DIR} a39db4db954fa9d7dc4ebe30d9bf3483d210cdc5
${RELATIVE_PROJECT_SOURCE_DIR} a39cae2ca11d65a3b4696ce0ba7b3f2429437b96
PACKAGE_REPOSITORY ${PACKAGE_REPOSITORY}
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES d7fca96349c39fce1db4f0a87780d1b75014a624
119099b65ce3d3dfa7ad3cc419bf7a963d508420)
SHA1_VALUES 9ba23228511e627e33928e3010b94fd9bc70d9f4
93dd2336f2d580afe793f22dd65479cb622dbf11)
else()
retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
${RELATIVE_PROJECT_SOURCE_DIR} 987483fe81c3f16b6b05914a6a488c3e8d85e9a1
${RELATIVE_PROJECT_SOURCE_DIR} 080bfc0e7d1fbfaacccc78ca7564d4a78bbb7020
PACKAGE_REPOSITORY ${PACKAGE_REPOSITORY}
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES 60783f45ecb6eac9938351d4793fba79ceb3283f
ce4925551c1759fa812b9441d37e4b331e2caf81)
SHA1_VALUES 36cd7e24d6b514d882d7600fc1544f5499ac7507
93dd2336f2d580afe793f22dd65479cb622dbf11)
endif()
elseif(APPLE)
retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
${RELATIVE_PROJECT_SOURCE_DIR} ee9401bf34b1ce8dcdf95beca1a88dee3ab34a65
${RELATIVE_PROJECT_SOURCE_DIR} 7c9407dc140d7eb19261182f557407124162de2d
PACKAGE_REPOSITORY ${PACKAGE_REPOSITORY}
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES e915e99c817217be7a2562c6bc3656cc42558d6c)
SHA1_VALUES 3cccf0afc1826a3aef7a356a0be0ed0ea1ea2101)
else()
retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
${RELATIVE_PROJECT_SOURCE_DIR} 5cdf38db5546509d211bcb964224c7490c9ff97a
${RELATIVE_PROJECT_SOURCE_DIR} 270dda02e5950e5f17673224f0f136ad693774b2
PACKAGE_REPOSITORY ${PACKAGE_REPOSITORY}
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES 3b179071772ed7820eb0bf4346ba3e75fe82ef27)
SHA1_VALUES 6db4bb2e39c254f1740c3a80a40c61c776f3c9a9)
endif()
else()
# Build libNuML as an external project
Expand Down
30 changes: 16 additions & 14 deletions src/plugins/thirdParty/libSBML/CMakeLists.txt
View file
Expand Up @@ -3,16 +3,16 @@ project(libSBMLPlugin)
# Name and version of our package

set(PACKAGE_NAME libSBML)
set(PACKAGE_VERSION 5.17.0)
set(PACKAGE_VERSION 5.18.0)

# Version of our package's libraries

set(MAJOR_LIBRARY_VERSION 5)
set(LIBRARY_VERSION ${MAJOR_LIBRARY_VERSION}.17.0)
set(LIBRARY_VERSION ${MAJOR_LIBRARY_VERSION}.18.0)

# Git tag for our library

set(GIT_TAG v5.17.0)
set(GIT_TAG v5.18.0)

# Package repository

Expand Down Expand Up @@ -63,34 +63,36 @@ if(USE_PREBUILT_LIBSBML_PACKAGE)
if(WIN32)
if(RELEASE_MODE)
retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
${RELATIVE_PROJECT_SOURCE_DIR} 529681a0289bc9402cb8e79ff405ab51e6df7ac8
${RELATIVE_PROJECT_SOURCE_DIR} 816b0d2d693561cfd1c8b8268c00665bca9cc9f7
PACKAGE_REPOSITORY ${PACKAGE_REPOSITORY}
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES 604b364f1b4d7ec294e408e3b2790ae059902a01
94c7394be6610b8831557bc390b0542c052ad3ab)
SHA1_VALUES 83cf96e9dda06bae8a109b850250793f6f11a5af
9b0f91cf59941dca597571b87991f7790a52fddd)
else()
retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
${RELATIVE_PROJECT_SOURCE_DIR} c8e180f8f97899b447a808fcfd402b82f357be33
${RELATIVE_PROJECT_SOURCE_DIR} d05e5e52d33e25d25f90746c64522b774a67079d
PACKAGE_REPOSITORY ${PACKAGE_REPOSITORY}
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES df6657338b75904e27be01ba8194c7d9b7cca7da
316e086388254eb24c2a61d4e0321219136dcae0)
SHA1_VALUES 5661f67ebb6191b5856469363ae80b0405acbd4a
b729843608a652001642197ad3db26cbc733c114)
endif()
elseif(APPLE)
retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
${RELATIVE_PROJECT_SOURCE_DIR} 7a92ce68e3e285b12854b04c59932f44df2f479b
${RELATIVE_PROJECT_SOURCE_DIR} 44aab4d24ea8df6e318f3800492555908c35d913
PACKAGE_REPOSITORY ${PACKAGE_REPOSITORY}
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES 561ba2196854e6993e537a83776014ef4b4ab4f0)
SHA1_VALUES 62723d3554d59b04738d700cfceaa85e76110adc)
else()
retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
${RELATIVE_PROJECT_SOURCE_DIR} e1efd4245977c34b525ce34ba87dccd9f4891ccd
${RELATIVE_PROJECT_SOURCE_DIR} a57fe8d76f839f0aa6433dede040b78ea739dab3
PACKAGE_REPOSITORY ${PACKAGE_REPOSITORY}
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES 76aadab74b4470aa0f1c612fe02c71714724d329)
SHA1_VALUES e78b46543bc75952d14722de098bef24c25ca685)
endif()
else()
# Download some dependencies for Windows, if needed
# Note: they can originally be found at
# https://sourceforge.net/projects/sbml/files/libsbml/win-dependencies/...

if(WIN32)
if(RELEASE_MODE)
Expand All @@ -99,7 +101,7 @@ else()
set(MODE debug)
endif()

set(DEPENDENCIES_FILENAME libSBML_dependencies_vs14_${MODE}_x64.zip)
set(DEPENDENCIES_FILENAME libSBML_dependencies_vs15_${MODE}_x64.zip)
set(DEPENDENCIES_DIR ${CMAKE_SOURCE_DIR}/src/plugins/thirdParty/libSBML/ext/dependencies)
set(DEPENDENCIES_MODE_DIR ${DEPENDENCIES_DIR}/${MODE})

Expand Down
1 change: 1 addition & 0 deletions src/plugins/thirdParty/libSBML/src/libsbmlbegin.h
View file
Expand Up @@ -29,6 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma clang diagnostic ignored "-Wdeprecated-dynamic-exception-spec"
#pragma clang diagnostic ignored "-Wdocumentation-unknown-command"
#pragma clang diagnostic ignored "-Wextra-semi"
#pragma clang diagnostic ignored "-Wnewline-eof"
#pragma clang diagnostic ignored "-Wundef"
#endif

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/thirdParty/libSBML/tests/tests.cpp
View file
Expand Up @@ -42,7 +42,7 @@ void Tests::basicTests()

// Check the version of libSBML

QCOMPARE(libsbml::getLibSBMLDottedVersion(), "5.17.0");
QCOMPARE(libsbml::getLibSBMLDottedVersion(), "5.18.0");

// Check against which libraries libSBML has been compiled

Expand Down
20 changes: 10 additions & 10 deletions src/plugins/thirdParty/libSEDML/CMakeLists.txt
View file
Expand Up @@ -63,31 +63,31 @@ if(USE_PREBUILT_LIBSEDML_PACKAGE)
if(WIN32)
if(RELEASE_MODE)
retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
${RELATIVE_PROJECT_SOURCE_DIR} 18fc2673869ca6f40d3cb6e17aec123a2dccca37
${RELATIVE_PROJECT_SOURCE_DIR} aa58e6f1c4599ee30fcf77f8767082094f01aeb7
PACKAGE_REPOSITORY ${PACKAGE_REPOSITORY}
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES 7ab5c523e8eb1e11f6ef865526ffbdd5ed01beea
404fd98fef8cabea7757f60d9de9eb6672fe006a)
SHA1_VALUES f63f7f2d03ed05561b7316ce3863678f26ae9eb9
fa9de78adbf4a9a74ed871d150f65477f6138ebe)
else()
retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
${RELATIVE_PROJECT_SOURCE_DIR} 98dd0a19f02a45f2e164d9e2090db7fe29e3a5e2
${RELATIVE_PROJECT_SOURCE_DIR} c2558bd77ed366ca6109bcddb9e22dc2af72ecf4
PACKAGE_REPOSITORY ${PACKAGE_REPOSITORY}
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES af5d225115778e213f6577d4fa2b9364196c51d6
404fd98fef8cabea7757f60d9de9eb6672fe006a)
SHA1_VALUES 72654f38292667fc2e9450fca544c02bcd666415
fa9de78adbf4a9a74ed871d150f65477f6138ebe)
endif()
elseif(APPLE)
retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
${RELATIVE_PROJECT_SOURCE_DIR} 7be2e5c00149b3351d03d3ba26194125493c9e66
${RELATIVE_PROJECT_SOURCE_DIR} 1f8e85082d57ba2820373d7652c53ac16d362e00
PACKAGE_REPOSITORY ${PACKAGE_REPOSITORY}
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES f1fb831e5cf1f3ddc7d674c2ab832f91cc9c38ab)
SHA1_VALUES cbac855943b834817a33c0f619afb9379098e777)
else()
retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
${RELATIVE_PROJECT_SOURCE_DIR} 5c8c9681b5f76e6eefa4e345d28fae297df9e80e
${RELATIVE_PROJECT_SOURCE_DIR} e7eee27dd9797404650e9fa7efd060db1ca81c0f
PACKAGE_REPOSITORY ${PACKAGE_REPOSITORY}
SHA1_FILES ${SHA1_FILES}
SHA1_VALUES 730ac3c50ce494a29b454d1e050f2b9b6dc81952)
SHA1_VALUES 81fd13a50eab84d6acaf1562bb515aa055638a5d)
endif()
else()
# Build libSEDML as an external project
Expand Down

0 comments on commit a47b4ef

Please sign in to comment.