diff options
| author | Brad King <brad.king@kitware.com> | 2016-02-08 15:35:30 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-02-08 15:35:30 (GMT) |
| commit | cb409699a40826cacc7ba5bc64936aed7ae0a286 (patch) | |
| tree | 42b27bb1679bfb3a38854f77c359f7987927775c /Source | |
| parent | 8a8d22cf1e5d20b7c3b32c1ec9b5f06b339c2a50 (diff) | |
| parent | c5eb21b6d1f4187778ad49545761a818e1126541 (diff) | |
| download | CMake-cb409699a40826cacc7ba5bc64936aed7ae0a286.zip CMake-cb409699a40826cacc7ba5bc64936aed7ae0a286.tar.gz CMake-cb409699a40826cacc7ba5bc64936aed7ae0a286.tar.bz2 | |
Merge branch 'fix-Fortran-module-in-subdir' into release
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmcmd.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index 1dc304c..e9d77b2 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -813,10 +813,8 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args) { cm.SetGlobalGenerator(ggd); cmState::Snapshot snapshot = cm.GetCurrentSnapshot(); - snapshot.GetDirectory().SetCurrentBinary - (cmSystemTools::GetCurrentWorkingDirectory()); - snapshot.GetDirectory().SetCurrentSource - (cmSystemTools::GetCurrentWorkingDirectory()); + snapshot.GetDirectory().SetCurrentBinary(startOutDir); + snapshot.GetDirectory().SetCurrentSource(startDir); cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(ggd, snapshot)); cmsys::auto_ptr<cmLocalGenerator> lgd( ggd->CreateLocalGenerator(mf.get())); |