Merge 363683a into 854dfca

opencor · Jul 7, 2018 · 41b8a6b · 41b8a6b
2 parents 854dfca + 363683a
commit 41b8a6b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/doc/downloads/index.js b/doc/downloads/index.js
@@ -39,7 +39,8 @@ var jsonData = { "versions": [
                      "changes": [
                        { "change": "<strong>Solvers:</strong> reference <a href=\"https://computation.llnl.gov/projects/sundials/cvode\">CVODE</a> rather than <a href=\"https://computation.llnl.gov/projects/sundials/cvodes\">CVODES</a> (see issue <a href=\"https://github.com/opencor/opencor/issues/1711\">#1711</a>)." },
                        { "change": "<strong>CellML-based views:</strong> fixed an issue that prevented some views from showing a CellML file that cannot be fully instantiated (see issue <a href=\"https://github.com/opencor/opencor/issues/1725\">#1725</a>)." },
-                       { "change": "<strong>Simualtion Experiment view:</strong> fixed some issues with manually added graphs and graphs associated with another file (see issue <a href=\"https://github.com/opencor/opencor/issues/1716\">#1716</a>)." }
+                       { "change": "<strong>Simualtion Experiment view:</strong> fixed some issues with manually added graphs and graphs associated with another file (see issue <a href=\"https://github.com/opencor/opencor/issues/1716\">#1716</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 6.0.1 (see issue <a href=\"https://github.com/opencor/opencor/issues/1729\">#1729</a>)." }
                      ]
                    },
                    { "major": 0, "minor": 4, "patch": 1, "day": 20, "month": 5, "year": 2015, "type": 0,

diff --git a/src/plugins/thirdParty/LLVMClang/CMakeLists.txt b/src/plugins/thirdParty/LLVMClang/CMakeLists.txt
@@ -3,16 +3,16 @@ project(LLVMClangPlugin)
 # Name and version of our package
 
 set(PACKAGE_NAME LLVMClang)
-set(PACKAGE_VERSION 6.0.0)
+set(PACKAGE_VERSION 6.0.1)
 
 # Version of our library
 
 set(MAJOR_LIBRARY_VERSION 6)
-set(LIBRARY_VERSION ${MAJOR_LIBRARY_VERSION}.0.0)
+set(LIBRARY_VERSION ${MAJOR_LIBRARY_VERSION}.0.1)
 
 # Git tag for our library
 
-set(GIT_TAG v6.0.0)
+set(GIT_TAG v6.0.1)
 
 # Specify where our local package will be installed
 
@@ -59,27 +59,27 @@ if(USE_PREBUILT_LLVMCLANG_PACKAGE)
     if(WIN32)
         if(RELEASE_MODE)
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${RELATIVE_PROJECT_SOURCE_DIR} daa6348cdfb8b785ca32719a63420a456cb3c59c
+                                  ${RELATIVE_PROJECT_SOURCE_DIR} 0f2fc28cb03237dcd06bc8fc67af643b76e62b82
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES 140c2f2400e131655977177143552bd38f9d6000
-                                              a92e24916a6700901fb51ea5c5fdcc197671586b)
+                                  SHA1_VALUES abcb040e9586e80f3e1ee49bcf4cd24f54230a99
+                                              0e98a97b96581e315733dfba3a65806845970355)
         else()
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${RELATIVE_PROJECT_SOURCE_DIR} fa02427295adca0f69da4e7d13211bb7b40fe7c3
+                                  ${RELATIVE_PROJECT_SOURCE_DIR} 44b49bd5e22b84cae60a1b3638747f13e6ca4687
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES b6d1e91b018835db6cd063af3ebfade4d7de291a
-                                              2090c0ee61718b55d62385cd4d5a5a181ca86cd7)
+                                  SHA1_VALUES 4761b1af7457212cc71beec83db08e36eaedd542
+                                              807283416f3607635aed395f93b7bf449c6bcdec)
         endif()
     elseif(APPLE)
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${RELATIVE_PROJECT_SOURCE_DIR} 8978c11462d76f607f86f53fcdd9ba4e58940814
+                              ${RELATIVE_PROJECT_SOURCE_DIR} b9de1a620a5842825152c9576dfd451c208e5ec9
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES 1adac16d0e20f006a9bc9a1608671f975bf96db2)
+                              SHA1_VALUES 3a7ccf9c69965eb992154a8181c3768d51d52f2e)
     else()
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${RELATIVE_PROJECT_SOURCE_DIR} bf1bf90cf7ee72a42e512e0d7972f4a6cde584dc
+                              ${RELATIVE_PROJECT_SOURCE_DIR} f2bb9922022c0b5150e8d906b1956ade6cbdb62e
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES 24bba92cb8adf0d7cbb56d71a56396a821438101)
+                              SHA1_VALUES 9f0f574fb53141c3fa04000d4849fea08c99f0c0)
     endif()
 else()
     # Allow for big objects and ignore some warnings