Set default warning level to 0.

egorpugin · egorpugin · commit 5e209ceb3a79 · 2017-03-14T14:13:09.000+03:00
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
@@ -178,7 +178,7 @@ void Settings::load_main(const yaml &root, const SettingsType type)
     EXTRACT_AUTO(full_path_executables);
     EXTRACT_AUTO(var_check_jobs);
     EXTRACT_AUTO(install_prefix);
-    EXTRACT_VAR(root, build_warning_level, "build_warning_level", int);
+    EXTRACT_AUTO(build_warning_level);
 
     // read build settings
     if (type == SettingsType::Local)
@@ -247,7 +247,7 @@ void Settings::load_build(const yaml &root)
     EXTRACT_AUTO(full_path_executables);
     EXTRACT_AUTO(var_check_jobs);
     EXTRACT_AUTO(install_prefix);
-    EXTRACT_VAR(root, build_warning_level, "build_warning_level", int);
+    EXTRACT_AUTO(build_warning_level);
 
     for (int i = 0; i < CMakeConfigurationType::Max; i++)
     {
diff --git a/src/common/settings.h b/src/common/settings.h
@@ -102,7 +102,8 @@ struct Settings
     // number of parallel jobs for variable checks
     int var_check_jobs = 0;
 
-    optional<int> build_warning_level;
+    // level of warnings on dependencies
+    int build_warning_level = 0;
 
     // following settings can be overriden in current build config
     bool use_cache = true;
diff --git a/src/printers/cmake.cpp b/src/printers/cmake.cpp
@@ -816,7 +816,7 @@ endif()
     ctx.addLine("set(CPPAN_BUILD_SHARED_LIBS "s + (s.use_shared_libs ? "1" : "0") + ")");
     ctx.addLine("set(CPPAN_DISABLE_CHECKS "s + (bs.disable_checks ? "1" : "0") + ")");
     ctx.addLine("set(CPPAN_BUILD_VERBOSE "s + (s.build_system_verbose ? "1" : "0") + ")");
-    ctx.addLine("set(CPPAN_BUILD_WARNING_LEVEL "s + (s.build_warning_level ? std::to_string(s.build_warning_level.get()) : "3") + ")");
+    ctx.addLine("set(CPPAN_BUILD_WARNING_LEVEL "s + std::to_string(s.build_warning_level) + ")");
     ctx.addLine("set(CPPAN_COPY_ALL_LIBRARIES_TO_OUTPUT "s + (s.copy_all_libraries_to_output ? "1" : "0") + ")");
     // build top level executables with input settings
     // otherwise it won't use them
@@ -858,7 +858,7 @@ int CMakePrinter::generate(const BuildSettings &bs) const
     args.push_back("-DCPPAN_COMMAND=" + normalize_path(get_program()));
     args.push_back("-DCPPAN_CMAKE_VERBOSE="s + (s.cmake_verbose ? "1" : "0"));
     args.push_back("-DCPPAN_BUILD_VERBOSE="s + (s.build_system_verbose ? "1" : "0"));
-    args.push_back("-DCPPAN_BUILD_WARNING_LEVEL="s + (s.build_warning_level ? std::to_string(s.build_warning_level.get()) : "3"));
+    args.push_back("-DCPPAN_BUILD_WARNING_LEVEL="s + std::to_string(s.build_warning_level));
     for (auto &o : s.cmake_options)
         args.push_back(o);
     for (auto &o : s.env)
@@ -2325,7 +2325,7 @@ void CMakePrinter::print_meta_config_file(const path &fn) const
     ctx.endif();
     ctx.addLine();
     ctx.if_("NOT DEFINED CPPAN_BUILD_WARNING_LEVEL");
-    ctx.addLine("set(CPPAN_BUILD_WARNING_LEVEL "s + (settings.build_warning_level ? std::to_string(settings.build_warning_level.get()) : "3") + ")");
+    ctx.addLine("set(CPPAN_BUILD_WARNING_LEVEL "s + std::to_string(settings.build_warning_level) + ")");
     ctx.endif();
     ctx.addLine();
     ctx.addLine("get_configuration_variables()");
