diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-15 15:13:12 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-10-15 15:14:09 (GMT) |
| commit | dc164bccc1a5c3e3e20b8c4c1ee655e9d83d5779 (patch) | |
| tree | 7a679351f6a20ad055e557bfe56a6e945317b87e /Source/cmake.cxx | |
| parent | e14518ec4507b008a4a1b842bb14a8587aacf055 (diff) | |
| parent | c9d73b26b0a78fac774a549de41eee55ed4e8d7b (diff) | |
| download | CMake-dc164bccc1a5c3e3e20b8c4c1ee655e9d83d5779.zip CMake-dc164bccc1a5c3e3e20b8c4c1ee655e9d83d5779.tar.gz CMake-dc164bccc1a5c3e3e20b8c4c1ee655e9d83d5779.tar.bz2 | |
Merge topic 'cmake-initial-cache-relative'
c9d73b26b0 cmake: Fix relative path regression in -C
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3912
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 563d077..bbd33a7 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++; |