"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "Source/cmGlobalVisualStudio7Generator.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.

cmGlobalVisualStudio7Generator.h  (cmake-3.13.4):cmGlobalVisualStudio7Generator.h  (cmake-3.14.0-rc1)
skipping to change at line 21 skipping to change at line 21
struct cmIDEFlagTable; struct cmIDEFlagTable;
/** \class cmGlobalVisualStudio7Generator /** \class cmGlobalVisualStudio7Generator
* \brief Write a Unix makefiles. * \brief Write a Unix makefiles.
* *
* cmGlobalVisualStudio7Generator manages UNIX build process for a tree * cmGlobalVisualStudio7Generator manages UNIX build process for a tree
*/ */
class cmGlobalVisualStudio7Generator : public cmGlobalVisualStudioGenerator class cmGlobalVisualStudio7Generator : public cmGlobalVisualStudioGenerator
{ {
public: public:
cmGlobalVisualStudio7Generator(cmake* cm,
const std::string& platformName = "");
~cmGlobalVisualStudio7Generator(); ~cmGlobalVisualStudio7Generator();
///! Get the name for the platform.
std::string const& GetPlatformName() const;
///! Create a local generator appropriate to this Global Generator ///! Create a local generator appropriate to this Global Generator
cmLocalGenerator* CreateLocalGenerator(cmMakefile* mf) override; cmLocalGenerator* CreateLocalGenerator(cmMakefile* mf) override;
bool SetSystemName(std::string const& s, cmMakefile* mf) override; #if defined(CMAKE_BUILD_WITH_CMAKE)
Json::Value GetJson() const override;
#endif
bool SetGeneratorPlatform(std::string const& p, cmMakefile* mf) override; bool SetSystemName(std::string const& s, cmMakefile* mf) override;
/** /**
* Utilized by the generator factory to determine if this generator * Utilized by the generator factory to determine if this generator
* supports toolsets. * supports toolsets.
*/ */
static bool SupportsToolset() { return false; } static bool SupportsToolset() { return false; }
/** /**
* Utilized by the generator factory to determine if this generator * Utilized by the generator factory to determine if this generator
* supports platforms. * supports platforms.
skipping to change at line 58 skipping to change at line 55
* Try to determine system information such as shared library * Try to determine system information such as shared library
* extension, pthreads, byte order etc. * extension, pthreads, byte order etc.
*/ */
void EnableLanguage(std::vector<std::string> const& languages, cmMakefile*, void EnableLanguage(std::vector<std::string> const& languages, cmMakefile*,
bool optional) override; bool optional) override;
/** /**
* Try running cmake and building a file. This is used for dynamically * Try running cmake and building a file. This is used for dynamically
* loaded commands, not as part of the usual build process. * loaded commands, not as part of the usual build process.
*/ */
void GenerateBuildCommand(std::vector<std::string>& makeCommand, void GenerateBuildCommand(GeneratedMakeCommand& makeCommand,
const std::string& makeProgram, const std::string& makeProgram,
const std::string& projectName, const std::string& projectName,
const std::string& projectDir, const std::string& projectDir,
const std::string& targetName, const std::string& targetName,
const std::string& config, bool fast, int jobs, const std::string& config, bool fast, int jobs,
bool verbose, bool verbose,
std::vector<std::string> const& makeOptions = std::vector<std::string> const& makeOptions =
std::vector<std::string>()) override; std::vector<std::string>()) override;
/** /**
skipping to change at line 109 skipping to change at line 106
/** Is the Microsoft Assembler enabled? */ /** Is the Microsoft Assembler enabled? */
bool IsMasmEnabled() const { return this->MasmEnabled; } bool IsMasmEnabled() const { return this->MasmEnabled; }
bool IsNasmEnabled() const { return this->NasmEnabled; } bool IsNasmEnabled() const { return this->NasmEnabled; }
// Encoding for Visual Studio files // Encoding for Visual Studio files
virtual std::string Encoding(); virtual std::string Encoding();
cmIDEFlagTable const* ExtraFlagTable; cmIDEFlagTable const* ExtraFlagTable;
protected: protected:
cmGlobalVisualStudio7Generator(cmake* cm,
std::string const& platformInGeneratorName);
void Generate() override; void Generate() override;
virtual const char* GetIDEVersion() = 0;
std::string const& GetDevEnvCommand(); std::string const& GetDevEnvCommand();
virtual std::string FindDevEnvCommand(); virtual std::string FindDevEnvCommand();
static const char* ExternalProjectType(const char* location); static const char* ExternalProjectType(const char* location);
virtual void OutputSLNFile(cmLocalGenerator* root, virtual void OutputSLNFile(cmLocalGenerator* root,
std::vector<cmLocalGenerator*>& generators); std::vector<cmLocalGenerator*>& generators);
virtual void WriteSLNFile(std::ostream& fout, cmLocalGenerator* root, virtual void WriteSLNFile(std::ostream& fout, cmLocalGenerator* root,
std::vector<cmLocalGenerator*>& generators) = 0; std::vector<cmLocalGenerator*>& generators) = 0;
skipping to change at line 134 skipping to change at line 133
const char* path, const char* path,
cmGeneratorTarget const* t) = 0; cmGeneratorTarget const* t) = 0;
virtual void WriteProjectConfigurations( virtual void WriteProjectConfigurations(
std::ostream& fout, const std::string& name, std::ostream& fout, const std::string& name,
cmGeneratorTarget const& target, std::vector<std::string> const& configs, cmGeneratorTarget const& target, std::vector<std::string> const& configs,
const std::set<std::string>& configsPartOfDefaultBuild, const std::set<std::string>& configsPartOfDefaultBuild,
const std::string& platformMapping = "") = 0; const std::string& platformMapping = "") = 0;
virtual void WriteSLNGlobalSections(std::ostream& fout, virtual void WriteSLNGlobalSections(std::ostream& fout,
cmLocalGenerator* root); cmLocalGenerator* root);
virtual void WriteSLNFooter(std::ostream& fout); virtual void WriteSLNFooter(std::ostream& fout);
virtual void WriteSLNHeader(std::ostream& fout) = 0;
std::string WriteUtilityDepend(const cmGeneratorTarget* target) override; std::string WriteUtilityDepend(const cmGeneratorTarget* target) override;
virtual void WriteTargetsToSolution( virtual void WriteTargetsToSolution(
std::ostream& fout, cmLocalGenerator* root, std::ostream& fout, cmLocalGenerator* root,
OrderedTargetDependSet const& projectTargets); OrderedTargetDependSet const& projectTargets);
virtual void WriteTargetDepends( virtual void WriteTargetDepends(
std::ostream& fout, OrderedTargetDependSet const& projectTargets); std::ostream& fout, OrderedTargetDependSet const& projectTargets);
virtual void WriteTargetConfigurations( virtual void WriteTargetConfigurations(
std::ostream& fout, std::vector<std::string> const& configs, std::ostream& fout, std::vector<std::string> const& configs,
OrderedTargetDependSet const& projectTargets); OrderedTargetDependSet const& projectTargets);
virtual void WriteExternalProject( virtual void WriteExternalProject(
std::ostream& fout, const std::string& name, const char* path, std::ostream& fout, const std::string& name, const char* path,
const char* typeGuid, const std::set<std::string>& dependencies) = 0; const char* typeGuid, const std::set<BT<std::string>>& dependencies) = 0;
std::string ConvertToSolutionPath(const char* path); std::string ConvertToSolutionPath(const char* path);
std::set<std::string> IsPartOfDefaultBuild( std::set<std::string> IsPartOfDefaultBuild(
std::vector<std::string> const& configs, std::vector<std::string> const& configs,
OrderedTargetDependSet const& projectTargets, OrderedTargetDependSet const& projectTargets,
cmGeneratorTarget const* target); cmGeneratorTarget const* target);
bool IsDependedOn(OrderedTargetDependSet const& projectTargets, bool IsDependedOn(OrderedTargetDependSet const& projectTargets,
cmGeneratorTarget const* target); cmGeneratorTarget const* target);
std::map<std::string, std::string> GUIDMap; std::map<std::string, std::string> GUIDMap;
virtual void WriteFolders(std::ostream& fout); virtual void WriteFolders(std::ostream& fout);
virtual void WriteFoldersContent(std::ostream& fout); virtual void WriteFoldersContent(std::ostream& fout);
std::map<std::string, std::set<std::string>> VisualStudioFolders; std::map<std::string, std::set<std::string>> VisualStudioFolders;
// Set during OutputSLNFile with the name of the current project. // Set during OutputSLNFile with the name of the current project.
// There is one SLN file per project. // There is one SLN file per project.
std::string CurrentProject; std::string CurrentProject;
std::string GeneratorPlatform;
std::string DefaultPlatformName;
bool MasmEnabled; bool MasmEnabled;
bool NasmEnabled; bool NasmEnabled;
private: private:
char* IntelProjectVersion; char* IntelProjectVersion;
std::string DevEnvCommand; std::string DevEnvCommand;
bool DevEnvCommandInitialized; bool DevEnvCommandInitialized;
std::string GetVSMakeProgram() override { return this->GetDevEnvCommand(); } std::string GetVSMakeProgram() override { return this->GetDevEnvCommand(); }
}; };
 End of changes. 10 change blocks. 
13 lines changed or deleted 9 lines changed or added

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