summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-10-14 20:18:16 (GMT)
committerBrad King <brad.king@kitware.com>2019-10-14 20:18:16 (GMT)
commit7716be4561505118bee90d54357f83f37092b53f (patch)
tree750cf05ebb2d7f151db6e51ac30773f2fd174344 /Source
parent74035b0ad4eb2eccf6537d6348afeb5d63222b5d (diff)
parentc9d73b26b0a78fac774a549de41eee55ed4e8d7b (diff)
downloadCMake-7716be4561505118bee90d54357f83f37092b53f.zip
CMake-7716be4561505118bee90d54357f83f37092b53f.tar.gz
CMake-7716be4561505118bee90d54357f83f37092b53f.tar.bz2
Merge branch 'cmake-initial-cache-relative' into release-3.16
Merge-request: !3912
Diffstat (limited to 'Source')
-rw-r--r--Source/cmake.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 50f47af..f63a264 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -423,6 +423,8 @@ bool cmake::SetCacheArgs(const std::vector<std::string>& args)
}
}
std::cout << "loading initial cache file " << path << "\n";
+ // Resolve script path specified on command line relative to $PWD.
+ path = cmSystemTools::CollapseFullPath(path);
this->ReadListFile(args, path);
} else if (arg.find("-P", 0) == 0) {
i++;