Fix crosscompilation variable warning. Fix multiple subdir levels.

egorpugin · egorpugin · commit aaa0a63071cd · 2018-07-28T04:42:30.000+03:00
diff --git a/src/common/config.cpp b/src/common/config.cpp
@@ -150,9 +150,10 @@ void Config::load(const yaml &root)
                 if (!fs::exists(d))
                     return;
 
+                auto tmp = subdir;
                 subdir = d.filename().string();
                 reload(d);
-                subdir.clear();
+                subdir = tmp;
 
                 for (auto &[s, p] : projects)
                     rd.known_local_packages.insert(p.pkg);
@@ -174,9 +175,10 @@ void Config::load(const yaml &root)
                     return;
                 if (kv["load_all_packages"].IsDefined() && kv["load_all_packages"].as<bool>())
                 {
+                    auto tmp = subdir;
                     subdir = d.filename().string();
                     reload(d);
-                    subdir.clear();
+                    subdir = tmp;
 
                     for (auto &[s, p] : projects)
                         rd.known_local_packages.insert(p.pkg);
diff --git a/src/printers/cmake.cpp b/src/printers/cmake.cpp
@@ -1288,7 +1288,8 @@ int CMakePrinter::generate(const BuildSettings &bs) const
         c.args.push_back("-DCPPAN_HOST_C_COMPILER=" + s.host_c_compiler);
     if (!s.host_cxx_compiler.empty())
         c.args.push_back("-DCPPAN_HOST_CXX_COMPILER=" + s.host_cxx_compiler);
-    c.args.push_back("-DCPPAN_CROSSCOMPILATION="s + (s.crosscompilation ? "1" : "0"));
+    if (s.crosscompilation)
+        c.args.push_back("-DCPPAN_CROSSCOMPILATION="s + (s.crosscompilation ? "1" : "0"));
     if (!s.generator.empty())
     {
         c.args.push_back("-G");
