Add output_dir setting. Create more links to src and obj dirs in storage.

egorpugin · egorpugin · commit f86d7018edeb · 2017-02-24T23:51:47.000+03:00
diff --git a/src/common/package_store.cpp b/src/common/package_store.cpp
@@ -29,6 +29,7 @@
 #include "project.h"
 #include "resolver.h"
 #include "settings.h"
+#include "shell_link.h"
 #include "sqlite_database.h"
 #include "templates.h"
 
@@ -273,7 +274,13 @@ void PackageStore::write_index() const
 {
     auto &sdb = getServiceDatabase();
     for (auto &cc : *this)
+    {
         sdb.addInstalledPackage(cc.first);
+#ifdef _WIN32
+        create_link(cc.first.getDirSrc(), directories.storage_dir_lnk / "src" / (cc.first.target_name + ".lnk"), "CPPAN link");
+        create_link(cc.first.getDirObj(), directories.storage_dir_lnk / "obj" / (cc.first.target_name + ".lnk"), "CPPAN link");
+#endif
+    }
 }
 
 Config *PackageStore::add_config(std::unique_ptr<Config> &&config, bool created)
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
@@ -146,6 +146,7 @@ void Settings::load_main(const yaml &root, const SettingsType type)
     EXTRACT(storage_dir, String);
     EXTRACT(build_dir, String);
     EXTRACT(cppan_dir, String);
+    EXTRACT(output_dir, String);
 
     auto &p = root["proxy"];
     if (p.IsDefined())
diff --git a/src/common/settings.h b/src/common/settings.h
@@ -67,6 +67,7 @@ struct Settings
     SettingsType build_dir_type{ SettingsType::System };
     path build_dir;
     path cppan_dir = ".cppan";
+    path output_dir = "bin";
     // printer
     PrinterType printerType{ PrinterType::CMake };
     // do not check for new cppan version
diff --git a/src/common/shell_link.h b/src/common/shell_link.h
@@ -18,4 +18,4 @@
 
 #include "filesystem.h"
 
-bool create_link(const path &file, const path &link, const String &description);
+bool create_link(const path &file, const path &link, const String &description = String());
diff --git a/src/printers/cmake.cpp b/src/printers/cmake.cpp
@@ -28,10 +28,7 @@
 #include <program.h>
 #include <resolver.h>
 #include <settings.h>
-
-#ifdef _WIN32
-#include "shell_link.h"
-#endif
+#include <shell_link.h>
 
 #include <boost/algorithm/string.hpp>
 
@@ -825,7 +822,7 @@ endif()
 
     // should be after flags
     config_section_title(ctx, "CPPAN include");
-    ctx.addLine("set(CPPAN_BUILD_OUTPUT_DIR \"" + normalize_path(fs::current_path()) + "\")");
+    ctx.addLine("set(CPPAN_BUILD_OUTPUT_DIR \"" + normalize_path(fs::current_path() / s.output_dir) + "\")");
     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") + ")");

Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,4 @@`
`18`	`18`
`19`	`19`	`#include "filesystem.h"`
`20`	`20`
`21`		`-bool create_link(const path &file, const path &link, const String &description);`
	`21`	`+bool create_link(const path &file, const path &link, const String &description = String());`