Fix clang warnings. Exclude CMakeLists.txt from list or source files for CMake 3.11.

egorpugin · egorpugin · commit 6988dd3bf7c4 · 2018-03-10T14:46:50.000+03:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -76,15 +76,20 @@ find_package(FLEX)
 ################################################################################
 
 if (CPPAN_TEST)
-add_definitions(-DCPPAN_TEST)
+add_definitions(/DCPPAN_TEST)
 endif()
 
 if (WIN32)
-    add_definitions(-DUNICODE)
+    add_definitions(/DUNICODE)
     if (MSVC)
-        set(disable_msvc_warnings "/W3 /wd4458 /wd4714 /wd4127 /wd4275 -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP ${disable_msvc_warnings}")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP ${disable_msvc_warnings}")
+        set(disable_msvc_warnings "/W3 /wd4458 /wd4714 /wd4127 /wd4275 /D_SCL_SECURE_NO_WARNINGS /D_CRT_SECURE_NO_WARNINGS /D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${disable_msvc_warnings}")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${disable_msvc_warnings}")
+
+        if (NOT CLANG)
+            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+        endif()
 
         if (MSVC_STATIC_RUNTIME)
             set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
@@ -103,6 +108,12 @@ if(MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std:c++17")
 endif()
 
+if (CLANG)
+    set(flags "-Wno-assume -Wno-potentially-evaluated-expression -Wno-delete-non-virtual-dtor")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flags}")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flags}")
+endif()
+
 ################################################################################
 #
 # build
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
@@ -6,7 +6,7 @@
 # cppan
 ########################################
 
-file(GLOB cppan_src "*")
+file(GLOB cppan_src "*.cpp" "*.h" "*.rc")
 
 add_executable(client ${cppan_src})
 target_link_libraries(client common
diff --git a/src/client/autotools.cpp b/src/client/autotools.cpp
@@ -602,7 +602,7 @@ void ac_processor::try_add(command &c)
     if (var.empty() || input.empty())
         return;
 
-    auto p = checks.addCheck<T>(var, input);
+    /*auto p = */checks.addCheck<T>(var, input);
 }
 
 void ac_processor::process_AC_LANG(command &c)
diff --git a/src/client/build.cpp b/src/client/build.cpp
@@ -31,7 +31,7 @@
 #include <iostream>
 
 #include <primitives/log.h>
-DECLARE_STATIC_LOGGER(logger, "build");
+//DECLARE_STATIC_LOGGER(logger, "build");
 
 int build_packages(const String &name, const PackagesSet &pkgs, const path &settings_fn, const String &config);
 int build_packages(const String &name, const PackagesSet &pkgs);
diff --git a/src/client/main.cpp b/src/client/main.cpp
@@ -45,7 +45,7 @@
 #include <thread>
 
 #include <primitives/log.h>
-DECLARE_STATIC_LOGGER(logger, "main");
+//DECLARE_STATIC_LOGGER(logger, "main");
 
 enum class ApiResult
 {
@@ -188,6 +188,8 @@ try
                 return 0;
             case ApiResult::Error:
                 return 1;
+            default:
+                break;
             }
 
             // file/url arg
@@ -1001,11 +1003,11 @@ ApiResult api_call(const String &cmd, const Strings &args)
 
     if (cmd == "notifications")
     {
-        auto proj_usage = []
+        /*auto proj_usage = []
         {
             std::cout << "invalid number of arguments\n";
             std::cout << "usage: cppan notifications [origin] [clear] [N]\n";
-        };
+        };*/
 
         size_t arg = 2;
 
diff --git a/src/common/api.cpp b/src/common/api.cpp
@@ -21,7 +21,7 @@
 #include "settings.h"
 
 #include <primitives/log.h>
-DECLARE_STATIC_LOGGER(logger, "api");
+//DECLARE_STATIC_LOGGER(logger, "api");
 
 ptree api_call(const Remote &r, const String &api, ptree request)
 {
@@ -148,6 +148,8 @@ void Api::get_notifications(const Remote &r, int n)
             case NotificationType::Success:
                 ss << "OK";
                 break;
+            default:
+                break;
         }
         LOG_INFO(logger, ss.str() << " " << ts << " " << t);
     }
diff --git a/src/common/checks.cpp b/src/common/checks.cpp
@@ -26,7 +26,7 @@
 #include <memory>
 
 #include <primitives/log.h>
-DECLARE_STATIC_LOGGER(logger, "checks");
+//DECLARE_STATIC_LOGGER(logger, "checks");
 
 const std::map<int, Check::Information> check_information{
     { Check::Function,
@@ -314,7 +314,7 @@ void Checks::load(const yaml &root)
                         s = n["decl"].template as<String>();
                     CheckParameters p;
                     p.load(n);
-                    auto ptr = this->addCheck<CheckDecl>(s, p);
+                    /*auto ptr = */this->addCheck<CheckDecl>(s, p);
                     return;
                 }
                 else if (n.IsScalar())
@@ -351,7 +351,7 @@ void Checks::load(const yaml &root)
         {
             auto f = v["function"].template as<String>();
             auto lib = v["library"].template as<String>();
-            auto p = this->addCheck<CheckLibraryFunction>(f, lib);
+            /*auto p = */this->addCheck<CheckLibraryFunction>(f, lib);
         }
     });
 
diff --git a/src/common/checks_detail.h b/src/common/checks_detail.h
@@ -442,7 +442,7 @@ struct CheckSource : public Check
 
     bool isOk() const override
     {
-        return !invert && getValue() || invert && !getValue();
+        return (!invert && getValue()) || (invert && !getValue());
     }
 };
 
diff --git a/src/common/config.cpp b/src/common/config.cpp
@@ -33,7 +33,7 @@
 #include <iostream>
 
 #include <primitives/log.h>
-DECLARE_STATIC_LOGGER(logger, "config");
+//DECLARE_STATIC_LOGGER(logger, "config");
 
 Config::Config()
 {
diff --git a/src/common/database.cpp b/src/common/database.cpp
@@ -40,7 +40,7 @@
 #include <shared_mutex>
 
 #include <primitives/log.h>
-DECLARE_STATIC_LOGGER(logger, "db");
+//DECLARE_STATIC_LOGGER(logger, "db");
 
 #define PACKAGES_DB_REFRESH_TIME_MINUTES 15
 
@@ -410,10 +410,9 @@ void ServiceDatabase::recreateTable(const TableDescriptor &td) const
 
 void ServiceDatabase::checkStamp() const
 {
-    bool assigned = false;
     String s;
     db->execute("select * from ClientStamp",
-        [&s, &assigned](SQLITE_CALLBACK_ARGS)
+        [&s](SQLITE_CALLBACK_ARGS)
     {
         s = cols[0];
         return 0;
@@ -1108,7 +1107,7 @@ IdDependencies PackagesDatabase::findDependencies(const Packages &deps) const
             // TODO: replace later with typed exception, so client will try to fetch same package from server
             throw std::runtime_error("Package '" + project.ppath.toString() + "' not found.");
 
-        auto find_deps = [&dep, &all_deps, this](auto &dependency)
+        auto find_deps = [&all_deps, this](auto &dependency)
         {
             dependency.flags.set(pfDirectDependency);
             dependency.id = getExactProjectVersionId(dependency, dependency.version, dependency.flags, dependency.hash);
diff --git a/src/common/enums.cpp b/src/common/enums.cpp
@@ -28,6 +28,8 @@ String toString(ProjectType e)
         return "Root Project";
     case ProjectType::Directory:
         return "Directory";
+    default:
+        break;
     }
     return std::to_string(toIndex(e));
 }
@@ -42,6 +44,8 @@ String toString(SettingsType e)
         return "user";
     case SettingsType::System:
         return "system";
+    default:
+        break;
     }
     return std::to_string(toIndex(e));
 }
diff --git a/src/common/package.cpp b/src/common/package.cpp
@@ -29,7 +29,7 @@
 #include <shared_mutex>
 
 #include <primitives/log.h>
-DECLARE_STATIC_LOGGER(logger, "package");
+//DECLARE_STATIC_LOGGER(logger, "package");
 
 path Package::getDir(const path &p) const
 {
diff --git a/src/common/package_store.cpp b/src/common/package_store.cpp
@@ -37,7 +37,7 @@
 #include <primitives/templates.h>
 
 #include <primitives/log.h>
-DECLARE_STATIC_LOGGER(logger, "package_store");
+//DECLARE_STATIC_LOGGER(logger, "package_store");
 
 // legacy varname rd - was: response data
 PackageStore rd;
diff --git a/src/common/project.cpp b/src/common/project.cpp
@@ -35,7 +35,7 @@
 #include <regex>
 
 #include <primitives/log.h>
-DECLARE_STATIC_LOGGER(logger, "project");
+//DECLARE_STATIC_LOGGER(logger, "project");
 
 using MimeType = String;
 using MimeTypes = std::set<MimeType>;
@@ -495,7 +495,7 @@ void Patch::load(const yaml &root)
 {
     auto load_replace = [&root](auto &a, const String &k)
     {
-        get_map_and_iterate(root, k, [&a, &k](auto &v)
+        get_map_and_iterate(root, k, [&a](auto &v)
         {
             auto k = v.first.template as<String>();
             if (v.second.IsScalar())
diff --git a/src/common/resolver.cpp b/src/common/resolver.cpp
@@ -36,7 +36,7 @@
 #include <primitives/templates.h>
 
 #include <primitives/log.h>
-DECLARE_STATIC_LOGGER(logger, "resolver");
+//DECLARE_STATIC_LOGGER(logger, "resolver");
 
 #define CURRENT_API_LEVEL 1
 
@@ -474,7 +474,7 @@ void Resolver::read_config(const ExtendedPackageData &d)
     try
     {
         auto p = rd.config_store.insert(std::make_unique<Config>(d.getDirSrc(), false));
-        auto ptr = rd.packages[d].config = p.first->get();
+        /*auto ptr = */rd.packages[d].config = p.first->get();
         //ptr->created = created;
     }
     catch (DependencyNotResolved &)
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
@@ -32,7 +32,7 @@
 #include <primitives/templates.h>
 
 #include <primitives/log.h>
-DECLARE_STATIC_LOGGER(logger, "settings");
+//DECLARE_STATIC_LOGGER(logger, "settings");
 
 void BuildSettings::set_build_dirs(const String &name)
 {
@@ -94,7 +94,7 @@ void Settings::load(const yaml &root, const SettingsType type)
         }
     };
 
-    auto get_build_dir = [this](const path &p, SettingsType type, const auto &dirs)
+    auto get_build_dir = [](const path &p, SettingsType type, const auto &dirs)
     {
         switch (type)
         {
@@ -497,6 +497,8 @@ Settings &Settings::get(SettingsType type)
         };
     }
         break;
+    default:
+        break;
     }
     return s;
 }
diff --git a/src/common/sqlite_database.cpp b/src/common/sqlite_database.cpp
@@ -24,7 +24,7 @@
 #include <algorithm>
 
 #include <primitives/log.h>
-DECLARE_STATIC_LOGGER(logger, "sqlite_db");
+//DECLARE_STATIC_LOGGER(logger, "sqlite_db");
 
 #define MAX_ERROR_SQL_LENGTH 200
 
diff --git a/src/common/verifier.cpp b/src/common/verifier.cpp
@@ -28,7 +28,7 @@
 #include <primitives/templates.h>
 
 #include <primitives/log.h>
-DECLARE_STATIC_LOGGER(logger, "verifier");
+//DECLARE_STATIC_LOGGER(logger, "verifier");
 
 void verify(const String &target_name)
 {
diff --git a/src/printers/cmake.cpp b/src/printers/cmake.cpp

Original file line number	Diff line number	Diff line change
`@@ -602,7 +602,7 @@ void ac_processor::try_add(command &c)`
`602`	`602`	`if (var.empty() \|\| input.empty())`
`603`	`603`	`return;`
`604`	`604`
`605`		`- auto p = checks.addCheck<T>(var, input);`
	`605`	`+ /auto p = /checks.addCheck<T>(var, input);`
`606`	`606`	`}`
`607`	`607`
`608`	`608`	`void ac_processor::process_AC_LANG(command &c)`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@`
`45`	`45`	`#include <thread>`
`46`	`46`
`47`	`47`	`#include <primitives/log.h>`
`48`		`-DECLARE_STATIC_LOGGER(logger, "main");`
	`48`	`+//DECLARE_STATIC_LOGGER(logger, "main");`
`49`	`49`
`50`	`50`	`enum class ApiResult`
`51`	`51`	`{`
`@@ -188,6 +188,8 @@ try`
`188`	`188`	`return 0;`
`189`	`189`	`case ApiResult::Error:`
`190`	`190`	`return 1;`
	`191`	`+ default:`
	`192`	`+ break;`
`191`	`193`	`}`
`192`	`194`
`193`	`195`	`// file/url arg`
`@@ -1001,11 +1003,11 @@ ApiResult api_call(const String &cmd, const Strings &args)`
`1001`	`1003`
`1002`	`1004`	`if (cmd == "notifications")`
`1003`	`1005`	`{`
`1004`		`- auto proj_usage = []`
	`1006`	`+ /*auto proj_usage = []`
`1005`	`1007`	`{`
`1006`	`1008`	`std::cout << "invalid number of arguments\n";`
`1007`	`1009`	`std::cout << "usage: cppan notifications [origin] [clear] [N]\n";`
`1008`		`- };`
	`1010`	`+ };*/`
`1009`	`1011`
`1010`	`1012`	`size_t arg = 2;`
`1011`	`1013`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`#include "settings.h"`
`22`	`22`
`23`	`23`	`#include <primitives/log.h>`
`24`		`-DECLARE_STATIC_LOGGER(logger, "api");`
	`24`	`+//DECLARE_STATIC_LOGGER(logger, "api");`
`25`	`25`
`26`	`26`	`ptree api_call(const Remote &r, const String &api, ptree request)`
`27`	`27`	`{`
`@@ -148,6 +148,8 @@ void Api::get_notifications(const Remote &r, int n)`
`148`	`148`	`case NotificationType::Success:`
`149`	`149`	`ss << "OK";`
`150`	`150`	`break;`
	`151`	`+ default:`
	`152`	`+ break;`
`151`	`153`	`}`
`152`	`154`	`LOG_INFO(logger, ss.str() << " " << ts << " " << t);`
`153`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -442,7 +442,7 @@ struct CheckSource : public Check`
`442`	`442`
`443`	`443`	`bool isOk() const override`
`444`	`444`	`{`
`445`		`- return !invert && getValue() \|\| invert && !getValue();`
	`445`	`+ return (!invert && getValue()) \|\| (invert && !getValue());`
`446`	`446`	`}`
`447`	`447`	`};`
`448`	`448`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`#include <iostream>`
`34`	`34`
`35`	`35`	`#include <primitives/log.h>`
`36`		`-DECLARE_STATIC_LOGGER(logger, "config");`
	`36`	`+//DECLARE_STATIC_LOGGER(logger, "config");`
`37`	`37`
`38`	`38`	`Config::Config()`
`39`	`39`	`{`