Add short_local_names option. Add explicit size checks.

egorpugin · egorpugin · commit 38cca3af380d · 2017-11-02T02:00:10.000+03:00
diff --git a/src/common/checks.cpp b/src/common/checks.cpp
@@ -912,6 +912,16 @@ void Checks::print_values(CMakeContext &ctx) const
         {
         case Check::Decl: // do not participate in parallel
             break;
+        case Check::Type:
+        {
+            auto &m = checks_to_print[c->getVariable()];
+            if (m && m->isOk())
+                continue;
+            m = c;
+            checks_to_print[Check::make_type_var(c->getData(), "SIZEOF_")] = c;
+            checks_to_print[Check::make_type_var(c->getData(), "SIZE_OF_")] = c;
+            break;
+        }
         case Check::Symbol:
             if (c->isOk())
             {
@@ -934,7 +944,7 @@ void Checks::print_values(CMakeContext &ctx) const
     }
 
     for (auto &kv : checks_to_print)
-        ctx.addLine("STRING;" + kv.second->getVariable() + ";" + std::to_string(kv.second->getValue()));
+        ctx.addLine("STRING;" + kv.first + ";" + std::to_string(kv.second->getValue()));
 }
 
 String Check::make_include_var(const String &i)
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
@@ -187,6 +187,7 @@ void Settings::load_main(const yaml &root, const SettingsType type)
     YAML_EXTRACT_AUTO(copy_all_libraries_to_output);
     YAML_EXTRACT_AUTO(copy_import_libs);
     YAML_EXTRACT_AUTO(rc_enabled);
+    YAML_EXTRACT_AUTO(short_local_names);
     YAML_EXTRACT_AUTO(full_path_executables);
     YAML_EXTRACT_AUTO(var_check_jobs);
     YAML_EXTRACT_AUTO(install_prefix);
@@ -268,6 +269,7 @@ void Settings::load_build(const yaml &root)
     YAML_EXTRACT_AUTO(copy_all_libraries_to_output);
     YAML_EXTRACT_AUTO(copy_import_libs);
     YAML_EXTRACT_AUTO(rc_enabled);
+    YAML_EXTRACT_AUTO(short_local_names);
     YAML_EXTRACT_AUTO(full_path_executables);
     YAML_EXTRACT_AUTO(var_check_jobs);
     YAML_EXTRACT_AUTO(install_prefix);
diff --git a/src/common/settings.h b/src/common/settings.h
@@ -119,6 +119,7 @@ struct Settings
     bool copy_import_libs = false;
     bool full_path_executables = false;
     bool rc_enabled = true;
+    bool short_local_names = false;
 
     String install_prefix;
 
diff --git a/src/printers/cmake.cpp b/src/printers/cmake.cpp
@@ -1738,7 +1738,12 @@ endif()
 
         if (!d.flags[pfHeaderOnly])
         {
-            set_target_properties(ctx, "OUTPUT_NAME", d.target_name);
+            if (!d.flags[pfLocalProject])
+                set_target_properties(ctx, "OUTPUT_NAME", d.target_name);
+            else
+            {
+                set_target_properties(ctx, "OUTPUT_NAME", Settings::get_local_settings().short_local_names ? d.ppath.back() : d.target_name);
+            }
             set_target_properties(ctx, "PROJECT_LABEL", d.flags[pfLocalProject] ? d.ppath.back() : d.target_name);
             ctx.emptyLines();
         }

Original file line number	Diff line number	Diff line change
`@@ -912,6 +912,16 @@ void Checks::print_values(CMakeContext &ctx) const`
`912`	`912`	`{`
`913`	`913`	`case Check::Decl: // do not participate in parallel`
`914`	`914`	`break;`
	`915`	`+ case Check::Type:`
	`916`	`+ {`
	`917`	`+ auto &m = checks_to_print[c->getVariable()];`
	`918`	`+ if (m && m->isOk())`
	`919`	`+ continue;`
	`920`	`+ m = c;`
	`921`	`+ checks_to_print[Check::make_type_var(c->getData(), "SIZEOF_")] = c;`
	`922`	`+ checks_to_print[Check::make_type_var(c->getData(), "SIZE_OF_")] = c;`
	`923`	`+ break;`
	`924`	`+ }`
`915`	`925`	`case Check::Symbol:`
`916`	`926`	`if (c->isOk())`
`917`	`927`	`{`
`@@ -934,7 +944,7 @@ void Checks::print_values(CMakeContext &ctx) const`
`934`	`944`	`}`
`935`	`945`
`936`	`946`	`for (auto &kv : checks_to_print)`
`937`		`- ctx.addLine("STRING;" + kv.second->getVariable() + ";" + std::to_string(kv.second->getValue()));`
	`947`	`+ ctx.addLine("STRING;" + kv.first + ";" + std::to_string(kv.second->getValue()));`
`938`	`948`	`}`
`939`	`949`
`940`	`950`	`String Check::make_include_var(const String &i)`
Original file line number	Diff line number	Diff line change
`@@ -1738,7 +1738,12 @@ endif()`
`1738`	`1738`
`1739`	`1739`	`if (!d.flags[pfHeaderOnly])`
`1740`	`1740`	`{`
`1741`		`- set_target_properties(ctx, "OUTPUT_NAME", d.target_name);`
	`1741`	`+ if (!d.flags[pfLocalProject])`
	`1742`	`+ set_target_properties(ctx, "OUTPUT_NAME", d.target_name);`
	`1743`	`+ else`
	`1744`	`+ {`
	`1745`	`+ set_target_properties(ctx, "OUTPUT_NAME", Settings::get_local_settings().short_local_names ? d.ppath.back() : d.target_name);`
	`1746`	`+ }`
`1742`	`1747`	`set_target_properties(ctx, "PROJECT_LABEL", d.flags[pfLocalProject] ? d.ppath.back() : d.target_name);`
`1743`	`1748`	`ctx.emptyLines();`
`1744`	`1749`	`}`