Revert build alias deps.

egorpugin · egorpugin · commit c58a43d42067 · 2018-04-15T19:59:08.000+03:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -156,6 +156,7 @@ cppan_add_package(
 
         pvt.cppan.demo.catchorg.catch2-2
 )
+#set(CPPAN_FORCE 1)
 cppan_execute()
 
 ################################################################################
diff --git a/src/inserts/CPPANConfig.cmake b/src/inserts/CPPANConfig.cmake
@@ -30,8 +30,12 @@ endfunction()
 function(cppan_execute)
     message(STATUS "cppan: processing dependencies")
 
+    if (CPPAN_FORCE)
+        set(CPPAN_FORCE -s)
+    endif()
+
     execute_process(
-        COMMAND ${CPPAN_EXECUTABLE} -d "${CPPAN_DEPS_DIR}"
+        COMMAND ${CPPAN_EXECUTABLE} -d "${CPPAN_DEPS_DIR}" ${CPPAN_FORCE}
         RESULT_VARIABLE ret
     )
     if (NOT ${ret} EQUAL 0)
diff --git a/src/printers/cmake.cpp b/src/printers/cmake.cpp
@@ -772,7 +772,7 @@ endif()
         local.addLine();
 
         // alias dependencies
-        /*if (d.empty())
+        if (d.empty())
         {
             auto tt = "add_dependencies"s;
             for (auto &dp : build_deps)
@@ -786,7 +786,7 @@ endif()
                     return tt + "(" + s + " ${this})";
                 });
             }
-        }*/
+        }
 
         if (has_build_deps)
             ctx.addWithRelativeIndent(local);
@@ -1261,7 +1261,8 @@ int CMakePrinter::generate(const BuildSettings &bs) const
     c.args.push_back("-DCPPAN_BUILD_VERBOSE="s + (s.build_system_verbose ? "1" : "0"));
     c.args.push_back("-DCPPAN_BUILD_WARNING_LEVEL="s + std::to_string(s.build_warning_level));
     c.args.push_back("-DCPPAN_USE_CACHE="s + (s.use_cache ? "1" : "0"));
-    c.args.push_back("-DCPPAN_SHORT_LOCAL_NAMES="s + (s.short_local_names ? "1" : "0"));
+    if (s.short_local_names)
+        c.args.push_back("-DCPPAN_SHORT_LOCAL_NAMES="s + (s.short_local_names ? "1" : "0"));
     //c.args.push_back("-DCPPAN_TEST_RUN="s + (bs.test_run ? "1" : "0"));
     for (auto &o : s.cmake_options)
         c.args.push_back(o);

Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,7 @@ cppan_add_package(`
`156`	`156`
`157`	`157`	`pvt.cppan.demo.catchorg.catch2-2`
`158`	`158`	`)`
	`159`	`+#set(CPPAN_FORCE 1)`
`159`	`160`	`cppan_execute()`
`160`	`161`
`161`	`162`	`################################################################################`