summaryrefslogtreecommitdiffstats
path: root/Tests/VSResource/include.rc.in
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-10-10 13:57:07 (GMT)
committerBrad King <brad.king@kitware.com>2014-10-13 12:20:05 (GMT)
commitf4c5eade787f4f0a6e33fe029c2816580db06041 (patch)
tree549735d61c4a2e81c9a05a0e9613b0bc756c8ce4 /Tests/VSResource/include.rc.in
parent5ab9aa62fe1e5e1e74bafc69bf0e8d16f118ac9d (diff)
downloadCMake-f4c5eade787f4f0a6e33fe029c2816580db06041.zip
CMake-f4c5eade787f4f0a6e33fe029c2816580db06041.tar.gz
CMake-f4c5eade787f4f0a6e33fe029c2816580db06041.tar.bz2
Ninja: Fix RC include directories regression
Changes in commit b9aa5041 (cmLocalGenerator: Simplify GetIncludeFlags output formatting, 2014-03-04) caused Windows Resource Compiler include directories to be computed as relative paths in the Ninja generator. This breaks the cmcldeps handling of include paths. The reason for the regression is that several cmLocalGenerator::GetIncludeFlags callers treated the fourth "bool forResponseFile" argument as if it controlled whether include directories were a full path. It actually did control that by accident until the above commit. Add an explicit "bool forceFullPaths" argument to GetIncludeFlags and thread the value through ConvertToIncludeReference as needed. Update GetIncludeFlags call sites that really wanted to control the forResponseFile setting to be aware of the new argument. Extend the VSResource test to cover this case.
Diffstat (limited to 'Tests/VSResource/include.rc.in')
-rw-r--r--Tests/VSResource/include.rc.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/Tests/VSResource/include.rc.in b/Tests/VSResource/include.rc.in
new file mode 100644
index 0000000..f0f6859
--- /dev/null
+++ b/Tests/VSResource/include.rc.in
@@ -0,0 +1 @@
+// This file should be included.