mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-30 02:59:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmWorkingDirectory: Add GetOldDirectory method

Browse Source
This commit is contained in:
Brad King
2020-04-03 09:46:03 -04:00
parent 753817e71d
commit 56cccde235
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/CPack/cmCPackGenerator.cxx
+2 -2
View File
@@ -402,7 +402,6 @@ int cmCPackGenerator::InstallProjectViaInstalledDirectories(
} }
/* rebuild symlinks in the installed tree */ /* rebuild symlinks in the installed tree */
if (!symlinkedFiles.empty()) { if (!symlinkedFiles.empty()) {
std::string curDir = cmSystemTools::GetCurrentWorkingDirectory();
std::string goToDir = cmStrCat(tempDir, '/', subdir); std::string goToDir = cmStrCat(tempDir, '/', subdir);
cmCPackLogger(cmCPackLog::LOG_DEBUG, cmCPackLogger(cmCPackLog::LOG_DEBUG,
"Change dir to: " << goToDir << std::endl); "Change dir to: " << goToDir << std::endl);
@@ -441,7 +440,8 @@ int cmCPackGenerator::InstallProjectViaInstalledDirectories(
} }
} }
cmCPackLogger(cmCPackLog::LOG_DEBUG, cmCPackLogger(cmCPackLog::LOG_DEBUG,
"Going back to: " << curDir << std::endl); "Going back to: " << workdir.GetOldDirectory()
<< std::endl);
} }
} }
} }
Source/cmWorkingDirectory.h
+2
View File
@@ -37,6 +37,8 @@ public:
*/ */
int GetLastResult() const { return ResultCode; } int GetLastResult() const { return ResultCode; }
std::string const& GetOldDirectory() const { return this->OldDir; }
private: private:
std::string OldDir; std::string OldDir;
int ResultCode; int ResultCode;