mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-02 12:19:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

CPack/FreeBSD: Use RAII to save/restore working directory

Browse Source
This commit is contained in:
Brad King
2020-04-03 09:43:04 -04:00
parent f4e4b41a19
commit 753817e71d
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/CPack/cmCPackFreeBSDGenerator.cxx
+2 -3
View File
@@ -8,6 +8,7 @@
#include "cmGeneratedFileStream.h" #include "cmGeneratedFileStream.h"
#include "cmStringAlgorithms.h" #include "cmStringAlgorithms.h"
#include "cmSystemTools.h" #include "cmSystemTools.h"
#include "cmWorkingDirectory.h"
// Needed for ::open() and ::stat() // Needed for ::open() and ::stat()
#include <algorithm> #include <algorithm>
@@ -285,8 +286,7 @@ int cmCPackFreeBSDGenerator::PackageFiles()
} }
std::vector<std::string>::const_iterator fileIt; std::vector<std::string>::const_iterator fileIt;
std::string dir = cmSystemTools::GetCurrentWorkingDirectory(); cmWorkingDirectory wd(toplevel);
cmSystemTools::ChangeDirectory(toplevel);
files.erase(std::remove_if(files.begin(), files.end(), ignore_file), files.erase(std::remove_if(files.begin(), files.end(), ignore_file),
files.end()); files.end());
@@ -332,6 +332,5 @@ int cmCPackFreeBSDGenerator::PackageFiles()
} }
} }
cmSystemTools::ChangeDirectory(dir);
return 1; return 1;
} }