Do not turn on CPPAN_EXECUTABLE for libraries.

egorpugin · egorpugin · commit 9e3bad24025e · 2018-07-30T00:48:49.000+03:00
diff --git a/src/common/config.cpp b/src/common/config.cpp
@@ -150,10 +150,8 @@ void Config::load(const yaml &root)
                 if (!fs::exists(d))
                     return;
 
-                auto tmp = subdir;
-                subdir = d.filename().string();
+                SwapAndRestore r(subdir, d.filename().string());
                 reload(d);
-                subdir = tmp;
 
                 for (auto &[s, p] : projects)
                     rd.known_local_packages.insert(p.pkg);
@@ -175,10 +173,8 @@ 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();
+                    SwapAndRestore r(subdir, d.filename().string());
                     reload(d);
-                    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
@@ -2168,7 +2168,8 @@ endif()
 
             // other
             ctx.increaseIndent("target_compile_definitions    (${this}");
-            ctx.addLine("PRIVATE CPPAN_EXECUTABLE");
+            if (d.flags[pfExecutable])
+                ctx.addLine("PRIVATE CPPAN_EXECUTABLE");
             ctx.addLine("PRIVATE ${LIBRARY_API}_EXTERN=");
             ctx.decreaseIndent(")");
         }

Original file line number	Diff line number	Diff line change
`@@ -2168,7 +2168,8 @@ endif()`
`2168`	`2168`
`2169`	`2169`	`// other`
`2170`	`2170`	`ctx.increaseIndent("target_compile_definitions (${this}");`
`2171`		`- ctx.addLine("PRIVATE CPPAN_EXECUTABLE");`
	`2171`	`+ if (d.flags[pfExecutable])`
	`2172`	`+ ctx.addLine("PRIVATE CPPAN_EXECUTABLE");`
`2172`	`2173`	`ctx.addLine("PRIVATE ${LIBRARY_API}_EXTERN=");`
`2173`	`2174`	`ctx.decreaseIndent(")");`
`2174`	`2175`	`}`