Merge 6cbf068 into fdea64b

opencor · Sep 26, 2019 · 8082437 · 8082437
2 parents fdea64b + 6cbf068
commit 8082437
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 44 deletions.
diff --git a/doc/downloads/index.js b/doc/downloads/index.js
@@ -37,7 +37,7 @@ var jsonData = { "versions": [
                        }
                      ],
                      "changes": [
-                       { "change": "<strong>Third-party libraries:</strong> upgraded the <a href=\"https://www.openssl.org/\">OpenSSL</a> library to version 1.1.1d (see issue <a href=\"https://github.com/opencor/opencor/issues/2157\">#2157</a>)." }
+                       { "change": "<strong>Third-party libraries:</strong> upgraded the <a href=\"https://www.openssl.org/\">OpenSSL</a> library to version 1.1.1d (see issue <a href=\"https://github.com/opencor/opencor/issues/2157\">#2157</a>). Upgraded <a href=\"http://www.llvm.org/\">LLVM</a>+<a href=\"http://clang.llvm.org/\">Clang</a> to version 9.0.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2161\">#2161</a>)." }
                      ]
                    },
                    { "major": 0, "minor": 5, "patch": 0, "day": 15, "month": 10, "year": 2016, "type": 0, "license": 1,

diff --git a/src/plugins/miscellaneous/Core/tests/mathmltests.cpp b/src/plugins/miscellaneous/Core/tests/mathmltests.cpp
@@ -38,21 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-void DummyMessageHandler::handleMessage(QtMsgType pType,
-                                        const QString &pDescription,
-                                        const QUrl &pIdentifier,
-                                        const QSourceLocation &pSourceLocation)
-{
-    Q_UNUSED(pType)
-    Q_UNUSED(pDescription)
-    Q_UNUSED(pIdentifier)
-    Q_UNUSED(pSourceLocation)
-
-    // We ignore the message...
-}
-
-//==============================================================================
-
 static QtMessageHandler gOrigMessageHandler;
 
 //==============================================================================
@@ -88,7 +73,7 @@ void MathmlTests::tests(const QString &pCategory)
 
     QString dirName = OpenCOR::dirName("src/plugins/miscellaneous/Core/tests/data")+"/"+pCategory+"/";
     QXmlQuery xmlQuery(QXmlQuery::XSLT20);
-    DummyMessageHandler dummyMessageHandler;
+    OpenCOR::Core::DummyMessageHandler dummyMessageHandler;
     QString actualOutput;
     QString expectedOutput;
     QString failMessage = QString();

diff --git a/src/plugins/miscellaneous/Core/tests/mathmltests.h b/src/plugins/miscellaneous/Core/tests/mathmltests.h
@@ -31,18 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //==============================================================================
 
-class DummyMessageHandler : public QAbstractMessageHandler
-{
-    Q_OBJECT
-
-protected:
-    void handleMessage(QtMsgType pType, const QString &pDescription,
-                       const QUrl &pIdentifier,
-                       const QSourceLocation &pSourceLocation) override;
-};
-
-//==============================================================================
-
 class MathmlTests : public QObject
 {
     Q_OBJECT

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 8.0.1)
+set(PACKAGE_VERSION 9.0.0)
 
 # Version of our library
 
-set(MAJOR_LIBRARY_VERSION 8)
-set(LIBRARY_VERSION ${MAJOR_LIBRARY_VERSION}.0.1)
+set(MAJOR_LIBRARY_VERSION 9)
+set(LIBRARY_VERSION ${MAJOR_LIBRARY_VERSION}.0.0)
 
 # Git tag for our library
 
-set(GIT_TAG v8.0.1)
+set(GIT_TAG v9.0.0)
 
 # Specify where our local package will be installed
 
@@ -57,33 +57,33 @@ if(USE_PREBUILT_LLVMCLANG_PACKAGE)
     if(WIN32)
         if(RELEASE_MODE)
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} fa4d6cd7ad0a1c3adf69c15a0bd9007573ab7f34
+                                  ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 62a2e14a56a312ffde072237edc227f6ee5435d6
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES 40bef0b054da540caea9bab207a940ae2c0661f1
-                                              c3e8323dacc6ba400524da57ab4ac9352f081168)
+                                  SHA1_VALUES 33b1bc033e0944ec5fa32fb03955f4dd60468890
+                                              19f6852616b7225465a9fce7aa4876020db037cc)
         else()
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 0105ffef19720699e655122b47b8ac66437e59bc
+                                  ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 7b856b4631ab16a182b0c326782d7fd04b7f02a7
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES d2214067f054f56d79ab0b1d5c52456614fbdaa6
-                                              c7ae90a9be859db514fd7b275e058876edf021fc)
+                                  SHA1_VALUES faefba96a620532b3270d7b84e4489e5019a34fc
+                                              81cd29270a71aa56b4178b89a63133170a13197f)
         endif()
     elseif(APPLE)
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} edcbae80c8ca43c8f69ced6e521dc9c80a956601
+                              ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 8e1798d9fafcf419c63edf9e4a882307a61ab955
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES b1a6164e5482ccc56c92973cf2a7a51da0140928)
+                              SHA1_VALUES 9dbcad3d57e436b35208cd06bf7149fd963fcd8a)
     else()
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} c35dc5a512c29940e1053f6cf8daf2cccad909dc
+                              ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} bbbbac602c0b3cadca80a4232712a1c05b510981
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES 8bd528fb974155b0a8f6ff33fe283968be090cec)
+                              SHA1_VALUES e45f4f4eae310fff10c6664dd0454770ba6e7696)
     endif()
 else()
     # Allow for big objects and ignore some warnings
 
     if(WIN32)
-        set(PACKAGE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj /wd4251 /wd4275 /wd4530")
+        set(PACKAGE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj /wd4251 /wd4275 /wd4530 /wd4996")
     endif()
 
     # Build LLVM+Clang as an external project
@@ -113,6 +113,7 @@ else()
             -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
             -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
             -DLLVMCLANG_BUILD_SHARED_LIB=ON
+            -DLLVM_BUILD_LLVM_C_DYLIB=OFF
             -DLLVM_BUILD_RUNTIME=OFF
             -DLLVM_BUILD_RUNTIMES=OFF
             -DLLVM_BUILD_UTILS=OFF
@@ -124,8 +125,10 @@ else()
             -DLLVM_ENABLE_LIBEDIT=OFF
             -DLLVM_ENABLE_LIBPFM=OFF
             -DLLVM_ENABLE_LIBXML2=OFF
+            -DLLVM_ENABLE_MODULE_DEBUGGING=OFF
             -DLLVM_ENABLE_OCAMLDOC=OFF
             -DLLVM_ENABLE_PEDANTIC=OFF
+            -DLLVM_ENABLE_PLUGINS=OFF
             -DLLVM_ENABLE_TERMINFO=OFF
             -DLLVM_ENABLE_WARNINGS=OFF
             -DLLVM_INCLUDE_BENCHMARKS=OFF

diff --git a/src/plugins/thirdParty/LLVMClang/src/llvmclangbegin.h b/src/plugins/thirdParty/LLVMClang/src/llvmclangbegin.h
@@ -27,6 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #pragma warning(disable: 4146)
     #pragma warning(disable: 4267)
     #pragma warning(disable: 4291)
+    #pragma warning(disable: 4624)
 #elif defined(Q_OS_LINUX)
     #pragma GCC diagnostic push
     #if defined(__GNUC__) && (__GNUC__ >= 8)