"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "Source/cmGlobVerificationManager.h" between
cmake-3.13.4.tar.gz and cmake-3.14.0-rc1.tar.gz

About: CMake is a cross-platform build system designed to build, test and package software. Release candidate.

cmGlobVerificationManager.h  (cmake-3.13.4):cmGlobVerificationManager.h  (cmake-3.14.0-rc1)
skipping to change at line 24 skipping to change at line 24
#include <vector> #include <vector>
/** \class cmGlobVerificationManager /** \class cmGlobVerificationManager
* \brief Class for expressing build-time dependencies on glob expressions. * \brief Class for expressing build-time dependencies on glob expressions.
* *
* Generates a CMake script which verifies glob outputs during prebuild. * Generates a CMake script which verifies glob outputs during prebuild.
* *
*/ */
class cmGlobVerificationManager class cmGlobVerificationManager
{ {
public:
cmGlobVerificationManager() {}
protected: protected:
///! Save verification script for given makefile. ///! Save verification script for given makefile.
///! Saves to output <path>/<CMakeFilesDirectory>/VerifyGlobs.cmake ///! Saves to output <path>/<CMakeFilesDirectory>/VerifyGlobs.cmake
bool SaveVerificationScript(const std::string& path); bool SaveVerificationScript(const std::string& path);
///! Add an entry into the glob cache ///! Add an entry into the glob cache
void AddCacheEntry(bool recurse, bool listDirectories, bool followSymlinks, void AddCacheEntry(bool recurse, bool listDirectories, bool followSymlinks,
const std::string& relative, const std::string& relative,
const std::string& expression, const std::string& expression,
const std::vector<std::string>& files, const std::vector<std::string>& files,
skipping to change at line 58 skipping to change at line 55
std::string const& GetVerifyStamp() const { return this->VerifyStamp; } std::string const& GetVerifyStamp() const { return this->VerifyStamp; }
private: private:
struct CacheEntryKey struct CacheEntryKey
{ {
const bool Recurse; const bool Recurse;
const bool ListDirectories; const bool ListDirectories;
const bool FollowSymlinks; const bool FollowSymlinks;
const std::string Relative; const std::string Relative;
const std::string Expression; const std::string Expression;
CacheEntryKey(const bool rec, const bool l, const bool s, CacheEntryKey(const bool rec, const bool l, const bool s, std::string rel,
const std::string& rel, const std::string& e) std::string e)
: Recurse(rec) : Recurse(rec)
, ListDirectories(l) , ListDirectories(l)
, FollowSymlinks(s) , FollowSymlinks(s)
, Relative(rel) , Relative(std::move(rel))
, Expression(e) , Expression(std::move(e))
{ {
} }
bool operator<(const CacheEntryKey& r) const; bool operator<(const CacheEntryKey& r) const;
void PrintGlobCommand(std::ostream& out, const std::string& cmdVar); void PrintGlobCommand(std::ostream& out, const std::string& cmdVar);
}; };
struct CacheEntryValue struct CacheEntryValue
{ {
bool Initialized; bool Initialized = false;
std::vector<std::string> Files; std::vector<std::string> Files;
std::vector<std::pair<std::string, cmListFileBacktrace>> Backtraces; std::vector<std::pair<std::string, cmListFileBacktrace>> Backtraces;
CacheEntryValue()
: Initialized(false)
{
}
}; };
typedef std::map<CacheEntryKey, CacheEntryValue> CacheEntryMap; typedef std::map<CacheEntryKey, CacheEntryValue> CacheEntryMap;
CacheEntryMap Cache; CacheEntryMap Cache;
std::string VerifyScript; std::string VerifyScript;
std::string VerifyStamp; std::string VerifyStamp;
// Only cmState should be able to add cache values. // Only cmState should be able to add cache values.
// cmGlobVerificationManager should never be used directly. // cmGlobVerificationManager should never be used directly.
friend class cmState; // allow access to add cache values friend class cmState; // allow access to add cache values
 End of changes. 5 change blocks. 
12 lines changed or deleted 5 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)