Better ninja support.

egorpugin · egorpugin · commit 5fdca4fbe259 · 2017-05-30T02:51:58.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,7 @@
 /bin*
 cppan
 .cppan*
-.vs
+.vs*
 
 *.kdev*
 
@@ -13,7 +13,7 @@ cppan
 /*.bat
 
 *~
-*.user
+*.user*
 
 *.lnk
 
diff --git a/cppan.yml b/cppan.yml
@@ -61,7 +61,6 @@ projects:
             - pvt.cppan.demo.boost.optional: 1
             - pvt.cppan.demo.boost.property_tree: 1
             - pvt.cppan.demo.boost.variant: 1
-            - pvt.cppan.demo.jbeder.yaml_cpp: master
             - pvt.cppan.demo.sqlite3: 3
 
             - pvt.egorpugin.primitives.string: master
@@ -75,6 +74,7 @@ projects:
             - pvt.egorpugin.primitives.log: master
             - pvt.egorpugin.primitives.pack: master
             - pvt.egorpugin.primitives.command: master
+            - pvt.egorpugin.primitives.yaml: master
 
         options:
             any:
diff --git a/src/client/main.cpp b/src/client/main.cpp
@@ -367,9 +367,9 @@ try
         c.load_current_config();
         Projects &projects = c.getProjects();
         const auto cwd = fs::current_path();
-        for (auto &p : projects)
+        for (auto &ps : projects)
         {
-            auto &project = p.second;
+            auto &project = ps.second;
 
             auto p = cwd;
             if (par)
diff --git a/src/common/checks.cpp b/src/common/checks.cpp
@@ -709,38 +709,39 @@ void Checks::read_parallel_checks_for_workers(const path &dir)
 
 void Checks::write_definitions(CMakeContext &ctx, const Package &d, const StringSet &prefixes) const
 {
-    String m = "INTERFACE";
-    if (!d.flags[pfHeaderOnly])
-        m = "PUBLIC";
-    if (d.flags[pfExecutable])
-        m = "PRIVATE";
-
-    auto print_def = [&ctx, &m, &prefixes](const String &value, auto &&s)
+    const auto m = [&d]
+    {
+        if (!d.flags[pfHeaderOnly])
+            return "PUBLIC"s;
+        if (d.flags[pfExecutable])
+            return "PRIVATE"s;
+        return "INTERFACE"s;
+    }();
+
+    auto print_def = [&ctx, &m, &prefixes](const auto &value, const auto &s)
     {
-        ctx << m << " " << s << "=" << value << CMakeContext::eol;
+        ctx.addLine(m + " " + s + "=" + value);
         for (const auto &p : prefixes)
-            ctx << m << " " << p + s << "=" << value << CMakeContext::eol;
+            ctx.addLine(m + " " + p + s + "=" + value);
         return 0;
     };
 
-    auto add_if_definition = [&ctx, &print_def](const String &s, const String &value, auto && ... defs)
+    auto add_if_definition = [&ctx, &print_def](const String &s, const String &value, const std::vector<String> &defs = std::vector<String>())
     {
-        ctx.addLine("if (" + s + ")");
-        ctx.increaseIndent();
+        ctx.if_(s);
         ctx.addLine("target_compile_definitions(${this}");
         ctx.increaseIndent();
         print_def(value, s);
-        using expand_type = int[];
-        expand_type{ 0, print_def(value, std::forward<decltype(defs)>(defs))... };
+        for (auto &def : defs)
+            print_def(value, def);
         ctx.decreaseIndent();
         ctx.addLine(")");
-        ctx.decreaseIndent();
-        ctx.addLine("endif()");
+        ctx.endif();
         ctx.addLine();
     };
 
     // aliases
-    add_if_definition("WORDS_BIGENDIAN", "1", "BIGENDIAN", "BIG_ENDIAN", "HOST_BIG_ENDIAN");
+    add_if_definition("WORDS_BIGENDIAN", "1", {"BIGENDIAN", "BIG_ENDIAN", "HOST_BIG_ENDIAN"});
 
     for (auto &c : checks)
     {
diff --git a/src/inserts/build.cmake b/src/inserts/build.cmake
@@ -78,7 +78,15 @@ if (MULTICORE)
     #set(parallel "-j ${N_CORES}") # temporary
 endif()
 
-if (CONFIG)
+if (NINJA)
+    cppan_debug_message("COMMAND ninja -C ${BUILD_DIR}")
+    execute_process(
+        COMMAND ninja -C ${BUILD_DIR}
+        ${OUTPUT_QUIET}
+        ${ERROR_QUIET}
+        RESULT_VARIABLE ret
+    )
+elseif (CONFIG)
     if (NOT DEFINED make OR
         "${make}" STREQUAL "" OR
         "${make}" STREQUAL "make-NOTFOUND" OR
@@ -131,7 +139,7 @@ if (CONFIG)
             RESULT_VARIABLE ret
         )
     endif()
-else(CONFIG)
+else()
     if ("${make}" STREQUAL "make-NOTFOUND")
         cppan_debug_message("COMMAND ${CMAKE_COMMAND}
                 --build ${BUILD_DIR}")
@@ -151,7 +159,7 @@ else(CONFIG)
             RESULT_VARIABLE ret
         )
     endif()
-endif(CONFIG)
+endif()
 
 check_result_variable(${ret})
 
diff --git a/src/printers/cmake.cpp b/src/printers/cmake.cpp
@@ -614,7 +614,11 @@ set(file ${BDIR}/cppan_build_deps_$<CONFIG>.${ext}))");
                 local.addText("-DMULTICORE=1 ");
             local.addText("${rest} ");
 
-            local.addText("-P " + normalize_path(p.getDirObj()) + "/" + cmake_obj_build_filename + "\")");
+            local.addText("-P " + normalize_path(p.getDirObj()) + "/" + cmake_obj_build_filename);
+#ifndef _WIN32
+            local.addText(" &");
+#endif
+            local.addText("\")");
         }
         local.emptyLines();
 

-Original file line number
+Diff line change
 /bin*
 cppan
 .cppan*
 -.vs
 +.vs*
 *.kdev*
 /*.bat
 *~
 -*.user
 +*.user*
 *.lnk