Merge f5beb28 into c34e935

opencor · Mar 23, 2019 · 1b38141 · 1b38141
2 parents c34e935 + f5beb28
commit 1b38141
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/doc/downloads/index.js b/doc/downloads/index.js
@@ -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>)." },
-                       { "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://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>)." }
                      ]
                    },
                    { "major": 0, "minor": 5, "patch": 0, "day": 15, "month": 10, "year": 2016, "type": 0, "license": 1,

diff --git a/src/plugins/thirdParty/libSEDML/CMakeLists.txt b/src/plugins/thirdParty/libSEDML/CMakeLists.txt
@@ -3,20 +3,21 @@ project(libSEDMLPlugin)
 # Name and version of our package
 
 set(PACKAGE_NAME libSEDML)
-set(PACKAGE_VERSION 0.4.3)
+set(PACKAGE_VERSION 0.4.4)
 
 # Version of our package's libraries
 
 set(MAJOR_LIBRARY_VERSION 0)
-set(LIBRARY_VERSION ${MAJOR_LIBRARY_VERSION}.4.3)
+set(LIBRARY_VERSION ${MAJOR_LIBRARY_VERSION}.4.4)
 
 # Git tag for our library
 
-set(GIT_TAG v0.4.3)
+set(GIT_TAG 0.4.4)
 
-# Package repository
+# Package repository and release tag
 
 set(PACKAGE_REPOSITORY libSEDML)
+SET(RELEASE_TAG 0.4.4)
 
 # Specify where our local package will be installed
 
@@ -63,31 +64,35 @@ if(USE_PREBUILT_LIBSEDML_PACKAGE)
     if(WIN32)
         if(RELEASE_MODE)
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${RELATIVE_PROJECT_SOURCE_DIR} ff370cd60079d0cbb1d70151ba1a53980c12ef39
+                                  ${RELATIVE_PROJECT_SOURCE_DIR} 18fc2673869ca6f40d3cb6e17aec123a2dccca37
                                   PACKAGE_REPOSITORY ${PACKAGE_REPOSITORY}
+                                  RELEASE_TAG ${RELEASE_TAG}
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES 26468ec5c1fd9d7016360454b5859329dabbc193
-                                              0941d5b8c439045de3e52065fcec355737286358)
+                                  SHA1_VALUES 7ab5c523e8eb1e11f6ef865526ffbdd5ed01beea
+                                              404fd98fef8cabea7757f60d9de9eb6672fe006a)
         else()
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${RELATIVE_PROJECT_SOURCE_DIR} 9af70876cda63372a50b5f50ad92573e1db7ba3c
+                                  ${RELATIVE_PROJECT_SOURCE_DIR} 98dd0a19f02a45f2e164d9e2090db7fe29e3a5e2
                                   PACKAGE_REPOSITORY ${PACKAGE_REPOSITORY}
+                                  RELEASE_TAG ${RELEASE_TAG}
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES baf4cf556f5bc84a2a192040966a0f411d9b8ff1
-                                              fa8d33829360b5139f4c882950722111691eb0cb)
+                                  SHA1_VALUES af5d225115778e213f6577d4fa2b9364196c51d6
+                                              404fd98fef8cabea7757f60d9de9eb6672fe006a)
         endif()
     elseif(APPLE)
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${RELATIVE_PROJECT_SOURCE_DIR} 37e2dd9b120818ff7376fde824115318cc149a66
+                              ${RELATIVE_PROJECT_SOURCE_DIR} 7be2e5c00149b3351d03d3ba26194125493c9e66
                               PACKAGE_REPOSITORY ${PACKAGE_REPOSITORY}
+                              RELEASE_TAG ${RELEASE_TAG}
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES d6690e7ac4fd4defd3ad32774e611cdb1b5bd09a)
+                              SHA1_VALUES f1fb831e5cf1f3ddc7d674c2ab832f91cc9c38ab)
     else()
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${RELATIVE_PROJECT_SOURCE_DIR} da409f582fc3c3390c796ec6e54483f8c018fd41
+                              ${RELATIVE_PROJECT_SOURCE_DIR} 5c8c9681b5f76e6eefa4e345d28fae297df9e80e
                               PACKAGE_REPOSITORY ${PACKAGE_REPOSITORY}
+                              RELEASE_TAG ${RELEASE_TAG}
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES 62397d3f1b0fdc1beaa45ef18a07a8bd1bfcfdba)
+                              SHA1_VALUES 730ac3c50ce494a29b454d1e050f2b9b6dc81952)
     endif()
 else()
     # Build libSEDML as an external project
@@ -179,6 +184,7 @@ else()
     create_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
                         ${LOCAL_EXTERNAL_PACKAGE_DIR}
                         PACKAGE_REPOSITORY ${PACKAGE_REPOSITORY}
+                        RELEASE_TAG ${RELEASE_TAG}
                         PACKAGED_FILES include ${SHA1_FILES}
                         SHA1_FILES ${SHA1_FILES}
                         TARGET ${PACKAGE_BUILD})

diff --git a/src/plugins/thirdParty/libSEDML/tests/tests.cpp b/src/plugins/thirdParty/libSEDML/tests/tests.cpp
@@ -42,7 +42,7 @@ void Tests::basicTests()
 
     // Check the version of libSEDML
 
-    QCOMPARE(libsedml::getLibSEDMLDottedVersion(), "0.4.3");
+    QCOMPARE(libsedml::getLibSEDMLDottedVersion(), "0.4.4");
 
     // Create a SED-ML document with a model inside it, then set the name of the
     // model and check that it has been properly set