diff options
| author | Brad King <brad.king@kitware.com> | 2018-10-25 11:34:31 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-10-25 11:34:35 (GMT) |
| commit | 8cabaaf054a16ea9c8332ce8e9291bd026b38c62 (patch) | |
| tree | f7a4c7db7e61b074318d7a252b1f7511721cb722 | |
| parent | f56fdf5736501a9ad2a06b2d4f923666edb20592 (diff) | |
| parent | e178bd46cbf2ddaf2e4d0e913986d4ff2320e22c (diff) | |
| download | CMake-8cabaaf054a16ea9c8332ce8e9291bd026b38c62.zip CMake-8cabaaf054a16ea9c8332ce8e9291bd026b38c62.tar.gz CMake-8cabaaf054a16ea9c8332ce8e9291bd026b38c62.tar.bz2 | |
Merge topic 'cmake-gui-vs-open-space'
e178bd46cb cmake-gui: Fix "Open Project" for VS IDE with space in path
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2524
| -rw-r--r-- | Source/cmGlobalVisualStudioGenerator.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx index 4aa52c3..da3daf8 100644 --- a/Source/cmGlobalVisualStudioGenerator.cxx +++ b/Source/cmGlobalVisualStudioGenerator.cxx @@ -878,12 +878,13 @@ bool cmGlobalVisualStudioGenerator::Open(const std::string& bindir, const std::string& projectName, bool dryRun) { - std::string buildDir = cmSystemTools::ConvertToOutputPath(bindir); - std::string sln = buildDir + "\\" + projectName + ".sln"; + std::string sln = bindir + "/" + projectName + ".sln"; if (dryRun) { return cmSystemTools::FileExists(sln, true); } + sln = cmSystemTools::ConvertToOutputPath(sln); + return std::async(std::launch::async, OpenSolution, sln).get(); } |