diff options
| author | Brad King <brad.king@kitware.com> | 2018-10-25 11:34:57 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-10-25 11:34:57 (GMT) |
| commit | 82db7cbed83fc17de8dcbb389cf5553789a2e256 (patch) | |
| tree | 6357d4774e8b5148487249317d44079be0b722ca /Source | |
| parent | 9f7b60969009c643dfa411b5f786b855078a6541 (diff) | |
| parent | e178bd46cbf2ddaf2e4d0e913986d4ff2320e22c (diff) | |
| download | CMake-82db7cbed83fc17de8dcbb389cf5553789a2e256.zip CMake-82db7cbed83fc17de8dcbb389cf5553789a2e256.tar.gz CMake-82db7cbed83fc17de8dcbb389cf5553789a2e256.tar.bz2 | |
Merge branch 'cmake-gui-vs-open-space' into release-3.13
Merge-request: !2524
Diffstat (limited to 'Source')
| -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(); } |