summaryrefslogtreecommitdiffstats
path: root/Source/QtDialog/CMakeSetup.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-03-18 18:20:46 (GMT)
committerBrad King <brad.king@kitware.com>2020-03-24 14:10:06 (GMT)
commit12b39aef7599a3ab6b1c1b9537d427839a9346b3 (patch)
tree36ccbd9854b82dd3c7aa25c4eb3f9a1ac6365916 /Source/QtDialog/CMakeSetup.cxx
parentc98ec3692ea2a98edb6c7c26ffc2e0d12863df99 (diff)
downloadCMake-12b39aef7599a3ab6b1c1b9537d427839a9346b3.zip
CMake-12b39aef7599a3ab6b1c1b9537d427839a9346b3.tar.gz
CMake-12b39aef7599a3ab6b1c1b9537d427839a9346b3.tar.bz2
Remove redundant calls to CollapseFullPath
Remove calls where it is known the input is already a collapsed full path.
Diffstat (limited to 'Source/QtDialog/CMakeSetup.cxx')
-rw-r--r--Source/QtDialog/CMakeSetup.cxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index ee81a7d..9d928b2 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@ -201,8 +201,7 @@ int main(int argc, char** argv)
cmSystemTools::CollapseFullPath(args[1].toLocal8Bit().data());
// check if argument is a directory containing CMakeCache.txt
- std::string buildFilePath =
- cmSystemTools::CollapseFullPath("CMakeCache.txt", filePath.c_str());
+ std::string buildFilePath = cmStrCat(filePath, "/CMakeCache.txt");
// check if argument is a CMakeCache.txt file
if (cmSystemTools::GetFilenameName(filePath) == "CMakeCache.txt" &&
@@ -211,8 +210,7 @@ int main(int argc, char** argv)
}
// check if argument is a directory containing CMakeLists.txt
- std::string srcFilePath =
- cmSystemTools::CollapseFullPath("CMakeLists.txt", filePath.c_str());
+ std::string srcFilePath = cmStrCat(filePath, "/CMakeLists.txt");
if (cmSystemTools::FileExists(buildFilePath.c_str())) {
dialog.setBinaryDirectory(QString::fromLocal8Bit(