Better link directories.

egorpugin · egorpugin · commit 5a3778feba8d · 2019-01-27T19:06:06.000+03:00
diff --git a/src/common/project.cpp b/src/common/project.cpp
@@ -1466,8 +1466,7 @@ OptionsMap loadOptionsMap(const yaml &root)
         add_opts_common(opt_level.second["compile_options"], option.compile_options, option.system_compile_options);
         add_opts_common(opt_level.second["link_options"], option.link_options, option.system_link_options);
         add_opts_common(opt_level.second["link_libraries"], option.link_libraries, option.system_link_libraries);
-
-        option.link_directories = get_sequence_set<String, String>(opt_level.second, "link_directories");
+        add_opts_common(opt_level.second["link_directories"], option.link_directories, option.system_link_directories);
 
         option.bs_insertions.load(opt_level.second);
     });
@@ -1497,15 +1496,14 @@ void saveOptionsMap(yaml &node, const OptionsMap &m)
         ADD_OPT(compile_options);
         ADD_OPT(link_options);
         ADD_OPT(link_libraries);
+        ADD_OPT(link_directories);
 
         ADD_OPT_SYS(definitions);
         ADD_OPT_SYS(include_directories);
         ADD_OPT_SYS(compile_options);
         ADD_OPT_SYS(link_options);
         ADD_OPT_SYS(link_libraries);
-
-        for (auto &v : o.link_directories)
-            root[ol.first]["link_directories"].push_back(v);
+        ADD_OPT_SYS(link_directories);
 
         auto n = root[ol.first];
         o.bs_insertions.save(n);
@@ -2011,6 +2009,7 @@ String Project::print_cpp2()
         print_obj(g->second.compile_options, g->second.system_compile_options, print_def, "xxx");
         print_obj(g->second.link_options, g->second.system_link_options, print_def, "xxx");
         print_obj(g->second.link_libraries, g->second.system_link_libraries, print_def, "lib");
+        print_obj(g->second.link_directories, g->second.system_link_directories, print_def, "ld");
     };
 
     print_group("any");
diff --git a/src/common/project.h b/src/common/project.h
@@ -141,27 +141,29 @@ struct Options
     using CompileOptions = ValueContainer;
     using LinkOptions = ValueContainer;
     using LinkLibraries = ValueContainer;
+    using LinkDirectories = ValueContainer;
 
     using SystemDefinitions = std::map<String, Definitions>;
     using SystemIncludeDirectories = std::map<String, IncludeDirectories>;
     using SystemCompileOptions = std::map<String, CompileOptions>;
     using SystemLinkOptions = std::map<String, LinkOptions>;
     using SystemLinkLibraries = std::map<String, LinkLibraries>;
+    using SystemLinkDirectories = std::map<String, LinkDirectories>;
 
 public:
     Definitions definitions;
     IncludeDirectories include_directories;
     CompileOptions compile_options;
     LinkOptions link_options;
     LinkLibraries link_libraries;
+    LinkLibraries link_directories;
 
     SystemDefinitions system_definitions;
     SystemIncludeDirectories system_include_directories;
     SystemCompileOptions system_compile_options;
     SystemLinkOptions system_link_options;
     SystemLinkLibraries system_link_libraries;
-
-    StringSet link_directories;
+    SystemLinkDirectories system_link_directories;
 
     BuildSystemConfigInsertions bs_insertions;
 };
diff --git a/src/printers/cmake.cpp b/src/printers/cmake.cpp
@@ -1940,11 +1940,6 @@ void CMakePrinter::print_src_config_file(const path &fn) const
 
     print_bs_insertion(ctx, p, "post sources", &BuildSystemConfigInsertions::post_sources);
 
-    for (auto &ol : p.options)
-        for (auto &ll : ol.second.link_directories)
-            ctx.addLine("link_directories(" + ll + ")");
-    ctx.emptyLines();
-
     // do this right before target
     if (!d.empty() && p.rc_enabled)
     {
@@ -2355,6 +2350,10 @@ endif()
             {
                 print_target_options(lopts, "link options", "target_link_libraries");
             };
+            auto print_linker_dirs = [&print_target_options](const auto &lopts)
+            {
+                print_target_options(lopts, "link directories", "target_link_directories");
+            };
             /*auto print_set = [&ctx, this](const auto &a, const String &s)
             {
                 if (a.empty())
@@ -2374,13 +2373,14 @@ endif()
                 ctx.decreaseIndent(")");
                 ctx.addLine();
             };*/
-            auto print_options = [&ctx, &ol, &print_defs, &print_compile_opts, &print_linker_opts, &print_include_dirs]
+            auto print_options = [&ctx, &ol, &print_defs, &print_compile_opts, &print_linker_opts, &print_linker_dirs, &print_include_dirs]
             {
                 print_defs(ol.second.definitions);
                 print_include_dirs(ol.second.include_directories);
                 print_compile_opts(ol.second.compile_options);
                 print_linker_opts(ol.second.link_options);
                 print_linker_opts(ol.second.link_libraries);
+                print_linker_dirs(ol.second.link_directories);
 
                 auto print_system = [&ctx](const auto &a, auto f)
                 {
@@ -2398,6 +2398,7 @@ endif()
                 print_system(ol.second.system_compile_options, print_compile_opts);
                 print_system(ol.second.system_link_options, print_linker_opts);
                 print_system(ol.second.system_link_libraries, print_linker_opts);
+                print_system(ol.second.system_link_directories, print_linker_dirs);
             };
 
             if (ol.first == "any")
