summaryrefslogtreecommitdiff
path: root/test cases/cmake/8 custom command/subprojects/cmMod/cmMod.cpp
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2019-11-28 19:54:08 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2019-11-30 22:00:18 +0200
commit36749a1625534386c1adefcd8ced5b45144501d1 (patch)
tree89e12b74995d6a2491752ae6763f798a487adccf /test cases/cmake/8 custom command/subprojects/cmMod/cmMod.cpp
parenteed05c9045ae2f5a326bfd418006fa7fd76b7748 (diff)
downloadmeson-36749a1625534386c1adefcd8ced5b45144501d1.tar.gz
cmake: Make output_target_map more robust (fixes #6208)
This PR refactors the old output_target_map, which was a raw dict, into it's own class. This makes the access to the map more uniform and robust (at the cost of more lines of code). Additionally relative paths to the build directory are now also tracked for outputs. This is neccessary to corretcly distingluish files with the same name, that are in different directories.
Diffstat (limited to 'test cases/cmake/8 custom command/subprojects/cmMod/cmMod.cpp')
-rw-r--r--test cases/cmake/8 custom command/subprojects/cmMod/cmMod.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/test cases/cmake/8 custom command/subprojects/cmMod/cmMod.cpp b/test cases/cmake/8 custom command/subprojects/cmMod/cmMod.cpp
index b7e8200d7..e6236e474 100644
--- a/test cases/cmake/8 custom command/subprojects/cmMod/cmMod.cpp
+++ b/test cases/cmake/8 custom command/subprojects/cmMod/cmMod.cpp
@@ -1,6 +1,7 @@
#include "cmMod.hpp"
#include "genTest.hpp"
#include "cpyBase.hpp"
+#include "cpyNext.hpp"
#include "cmModLib.hpp"
#ifndef FOO
@@ -18,5 +19,5 @@ string cmModClass::getStr() const {
}
string cmModClass::getOther() const {
- return getStr() + " -- " + getStrCpy();
+ return "Srings:\n - " + getStrCpy() + "\n - " + getStrNext();
}