Pass defines flags when calling clang (cppcheck-opensource#2651)

Ken-Patrick · web-flow · commit 79d3f488dacf · 2020-05-20T14:56:55.000+02:00
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -233,6 +233,14 @@ static std::string executeAddon(const AddonInfo &addonInfo,
     return result;
 }
 
+static std::string getDefinesFlags(const std::string &semicolonSeparatedString)
+{
+    std::string flags;
+    for (const std::string &d: split(semicolonSeparatedString, ";"))
+        flags += "-D" + d + " ";
+    return flags;
+}
+
 CppCheck::CppCheck(ErrorLogger &errorLogger,
                    bool useGlobalSuppressions,
                    std::function<bool(std::string,std::vector<std::string>,std::string,std::string*)> executeCommand)
@@ -350,6 +358,9 @@ unsigned int CppCheck::check(const std::string &path)
         for (const std::string &i: mSettings.includePaths)
             flags += "-I" + i + " ";
 
+        flags += getDefinesFlags(mSettings.userDefines);
+
+
         const std::string args2 = "-cc1 -ast-dump " + flags + path;
         const std::string redirect2 = analyzerInfo.empty() ? std::string("2>&1") : ("2> " + clangStderr);
         if (!mSettings.buildDir.empty()) {
@@ -1407,16 +1418,11 @@ void CppCheck::getErrorMessages()
 void CppCheck::analyseClangTidy(const ImportProject::FileSettings &fileSettings)
 {
     std::string allIncludes = "";
-    std::string allDefines = "-D"+fileSettings.defines;
     for (const std::string &inc : fileSettings.includePaths) {
         allIncludes = allIncludes + "-I\"" + inc + "\" ";
     }
 
-    std::string::size_type pos = 0u;
-    while ((pos = allDefines.find(";", pos)) != std::string::npos) {
-        allDefines.replace(pos, 1, " -D");
-        pos += 3;
-    }
+    const std::string allDefines = getDefinesFlags(fileSettings.defines);
 
 #ifdef _WIN32
     const char exe[] = "clang-tidy.exe";
