Merge 88cb024 into 50be964

opencor · Sep 20, 2018 · ee47643 · ee47643
2 parents 50be964 + 88cb024
commit ee47643
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,6 +39,7 @@ var jsonData = { "versions": [
                      "changes": [
                        { "change": "<strong>General:</strong> improved HiDPI support on Windows (see issue <a href=\"https://github.com/opencor/opencor/issues/1776\">#1776</a>)." },
                        { "change": "<strong>Editor widget:</strong> properly highlight/replace text that was found using a regular expression (see issue <a href=\"https://github.com/opencor/opencor/issues/1816\">#1816</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 7.0.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/1814\">#1814</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.1)
+set(PACKAGE_VERSION 7.0.0)
 
 # Version of our library
 
-set(MAJOR_LIBRARY_VERSION 6)
-set(LIBRARY_VERSION ${MAJOR_LIBRARY_VERSION}.0.1)
+set(MAJOR_LIBRARY_VERSION 7)
+set(LIBRARY_VERSION ${MAJOR_LIBRARY_VERSION}.0.0)
 
 # Git tag for our library
 
-set(GIT_TAG v6.0.1)
+set(GIT_TAG v7.0.0)
 
 # 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} 0f2fc28cb03237dcd06bc8fc67af643b76e62b82
+                                  ${RELATIVE_PROJECT_SOURCE_DIR} 44e119d0e0021de9517b153b0ee38a4b4a3054f8
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES abcb040e9586e80f3e1ee49bcf4cd24f54230a99
-                                              0e98a97b96581e315733dfba3a65806845970355)
+                                  SHA1_VALUES 76b8b632c6268ed2c953f03b5a4a0b1717302910
+                                              ee9b3a3e46814d7a2cc83a7f5622595f01216429)
         else()
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${RELATIVE_PROJECT_SOURCE_DIR} 44b49bd5e22b84cae60a1b3638747f13e6ca4687
+                                  ${RELATIVE_PROJECT_SOURCE_DIR} db3deb8515602898d7ac46a63b3c818efad44202
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES 4761b1af7457212cc71beec83db08e36eaedd542
-                                              807283416f3607635aed395f93b7bf449c6bcdec)
+                                  SHA1_VALUES 353a1291938b6786ffd1cd1285d8e22eaab757fd
+                                              b88ec6f390197566752093a1bacefeb564df94db)
         endif()
     elseif(APPLE)
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${RELATIVE_PROJECT_SOURCE_DIR} b9de1a620a5842825152c9576dfd451c208e5ec9
+                              ${RELATIVE_PROJECT_SOURCE_DIR} 86a15544012894e441967d7065c1498e01ce2f19
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES 3a7ccf9c69965eb992154a8181c3768d51d52f2e)
+                              SHA1_VALUES 4c81e951615baad69c5ff4e3d5a2a77d8a19b6b4)
     else()
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${RELATIVE_PROJECT_SOURCE_DIR} f2bb9922022c0b5150e8d906b1956ade6cbdb62e
+                              ${RELATIVE_PROJECT_SOURCE_DIR} 8fea76a8a224a7cd2f5f36bb5517ccf2f5fff40c
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES 9f0f574fb53141c3fa04000d4849fea08c99f0c0)
+                              SHA1_VALUES b5120a9808e0ed1eb7fd98857fead75012b4eb2a)
     endif()
 else()
     # Allow for big objects and ignore some warnings