"Fossies" - the Fresh Open Source Software Archive  

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

cmGlobalVisualStudio10Generator.h  (cmake-3.13.4):cmGlobalVisualStudio10Generator.h  (cmake-3.14.0-rc1)
skipping to change at line 17 skipping to change at line 17
#include "cmVisualStudio10ToolsetOptions.h" #include "cmVisualStudio10ToolsetOptions.h"
/** \class cmGlobalVisualStudio10Generator /** \class cmGlobalVisualStudio10Generator
* \brief Write a Unix makefiles. * \brief Write a Unix makefiles.
* *
* cmGlobalVisualStudio10Generator manages UNIX build process for a tree * cmGlobalVisualStudio10Generator manages UNIX build process for a tree
*/ */
class cmGlobalVisualStudio10Generator : public cmGlobalVisualStudio8Generator class cmGlobalVisualStudio10Generator : public cmGlobalVisualStudio8Generator
{ {
public: public:
cmGlobalVisualStudio10Generator(cmake* cm, const std::string& name,
const std::string& platformName);
static cmGlobalGeneratorFactory* NewFactory(); static cmGlobalGeneratorFactory* NewFactory();
bool MatchesGeneratorName(const std::string& name) const override; bool MatchesGeneratorName(const std::string& name) const override;
bool SetSystemName(std::string const& s, cmMakefile* mf) override; bool SetSystemName(std::string const& s, cmMakefile* mf) override;
bool SetGeneratorPlatform(std::string const& p, cmMakefile* mf) override; bool SetGeneratorPlatform(std::string const& p, cmMakefile* mf) override;
bool SetGeneratorToolset(std::string const& ts, cmMakefile* mf) override; bool SetGeneratorToolset(std::string const& ts, cmMakefile* mf) override;
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;
///! create the correct local generator ///! create the correct local generator
cmLocalGenerator* CreateLocalGenerator(cmMakefile* mf) override; cmLocalGenerator* CreateLocalGenerator(cmMakefile* mf) override;
/** /**
* 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;
void WriteSLNHeader(std::ostream& fout) override;
bool IsCudaEnabled() const { return this->CudaEnabled; } bool IsCudaEnabled() const { return this->CudaEnabled; }
/** Generating for Nsight Tegra VS plugin? */ /** Generating for Nsight Tegra VS plugin? */
bool IsNsightTegra() const; bool IsNsightTegra() const;
std::string GetNsightTegraVersion() const; std::string GetNsightTegraVersion() const;
/** The toolset name for the target platform. */ /** The toolset name for the target platform. */
const char* GetPlatformToolset() const; const char* GetPlatformToolset() const;
std::string const& GetPlatformToolsetString() const; std::string const& GetPlatformToolsetString() const;
/** The toolset version. */ /** The toolset version. */
const char* GetPlatformToolsetVersion() const; const char* GetPlatformToolsetVersion() const;
std::string const& GetPlatformToolsetVersionString() const; std::string const& GetPlatformToolsetVersionString() const;
/** The toolset host architecture name (e.g. x64 for 64-bit host tools). */ /** The toolset host architecture name (e.g. x64 for 64-bit host tools). */
const char* GetPlatformToolsetHostArchitecture() const; const char* GetPlatformToolsetHostArchitecture() const;
std::string const& GetPlatformToolsetHostArchitectureString() const;
/** The cuda toolset version. */ /** The cuda toolset version. */
const char* GetPlatformToolsetCuda() const; const char* GetPlatformToolsetCuda() const;
std::string const& GetPlatformToolsetCudaString() const; std::string const& GetPlatformToolsetCudaString() const;
/** Return whether we need to use No/Debug instead of false/true /** Return whether we need to use No/Debug instead of false/true
for GenerateDebugInformation. */ for GenerateDebugInformation. */
bool GetPlatformToolsetNeedsDebugEnum() const bool GetPlatformToolsetNeedsDebugEnum() const
{ {
return this->PlatformToolsetNeedsDebugEnum; return this->PlatformToolsetNeedsDebugEnum;
skipping to change at line 89 skipping to change at line 87
/** Return the CMAKE_SYSTEM_VERSION. */ /** Return the CMAKE_SYSTEM_VERSION. */
std::string const& GetSystemVersion() const { return this->SystemVersion; } std::string const& GetSystemVersion() const { return this->SystemVersion; }
/** Return the Windows version targeted on VS 2015 and above. */ /** Return the Windows version targeted on VS 2015 and above. */
std::string const& GetWindowsTargetPlatformVersion() const std::string const& GetWindowsTargetPlatformVersion() const
{ {
return this->WindowsTargetPlatformVersion; return this->WindowsTargetPlatformVersion;
} }
/** Return true if building for WindowsCE */ /** Return true if building for WindowsCE */
bool TargetsWindowsCE() const { return this->SystemIsWindowsCE; } bool TargetsWindowsCE() const override { return this->SystemIsWindowsCE; }
/** Return true if building for WindowsPhone */ /** Return true if building for WindowsPhone */
bool TargetsWindowsPhone() const { return this->SystemIsWindowsPhone; } bool TargetsWindowsPhone() const { return this->SystemIsWindowsPhone; }
/** Return true if building for WindowsStore */ /** Return true if building for WindowsStore */
bool TargetsWindowsStore() const { return this->SystemIsWindowsStore; } bool TargetsWindowsStore() const { return this->SystemIsWindowsStore; }
const char* GetCMakeCFGIntDir() const override { return "$(Configuration)"; } const char* GetCMakeCFGIntDir() const override { return "$(Configuration)"; }
bool Find64BitTools(cmMakefile* mf); bool Find64BitTools(cmMakefile* mf);
/** Generate an <output>.rule file path for a given command output. */ /** Generate an <output>.rule file path for a given command output. */
std::string GenerateRuleFile(std::string const& output) const override; std::string GenerateRuleFile(std::string const& output) const override;
void PathTooLong(cmGeneratorTarget* target, cmSourceFile const* sf, void PathTooLong(cmGeneratorTarget* target, cmSourceFile const* sf,
std::string const& sfRel); std::string const& sfRel);
std::string Encoding() override; std::string Encoding() override;
virtual const char* GetToolsVersion() { return "4.0"; } const char* GetToolsVersion() const;
virtual bool IsDefaultToolset(const std::string& version) const; virtual bool IsDefaultToolset(const std::string& version) const;
virtual std::string GetAuxiliaryToolset() const; virtual std::string GetAuxiliaryToolset() const;
bool FindMakeProgram(cmMakefile* mf) override; bool FindMakeProgram(cmMakefile* mf) override;
bool IsIPOSupported() const override { return true; } bool IsIPOSupported() const override { return true; }
static std::string GetInstalledNsightTegraVersion(); static std::string GetInstalledNsightTegraVersion();
skipping to change at line 129 skipping to change at line 127
cmIDEFlagTable const* GetCSharpFlagTable() const; cmIDEFlagTable const* GetCSharpFlagTable() const;
cmIDEFlagTable const* GetRcFlagTable() const; cmIDEFlagTable const* GetRcFlagTable() const;
cmIDEFlagTable const* GetLibFlagTable() const; cmIDEFlagTable const* GetLibFlagTable() const;
cmIDEFlagTable const* GetLinkFlagTable() const; cmIDEFlagTable const* GetLinkFlagTable() const;
cmIDEFlagTable const* GetCudaFlagTable() const; cmIDEFlagTable const* GetCudaFlagTable() const;
cmIDEFlagTable const* GetCudaHostFlagTable() const; cmIDEFlagTable const* GetCudaHostFlagTable() const;
cmIDEFlagTable const* GetMasmFlagTable() const; cmIDEFlagTable const* GetMasmFlagTable() const;
cmIDEFlagTable const* GetNasmFlagTable() const; cmIDEFlagTable const* GetNasmFlagTable() const;
protected: protected:
cmGlobalVisualStudio10Generator(cmake* cm, const std::string& name,
std::string const& platformInGeneratorName);
void Generate() override; void Generate() override;
virtual bool InitializeSystem(cmMakefile* mf); virtual bool InitializeSystem(cmMakefile* mf);
virtual bool InitializeWindows(cmMakefile* mf); virtual bool InitializeWindows(cmMakefile* mf);
virtual bool InitializeWindowsCE(cmMakefile* mf); virtual bool InitializeWindowsCE(cmMakefile* mf);
virtual bool InitializeWindowsPhone(cmMakefile* mf); virtual bool InitializeWindowsPhone(cmMakefile* mf);
virtual bool InitializeWindowsStore(cmMakefile* mf); virtual bool InitializeWindowsStore(cmMakefile* mf);
virtual bool ProcessGeneratorToolsetField(std::string const& key, virtual bool ProcessGeneratorToolsetField(std::string const& key,
std::string const& value); std::string const& value);
virtual std::string SelectWindowsCEToolset() const; virtual std::string SelectWindowsCEToolset() const;
virtual bool SelectWindowsPhoneToolset(std::string& toolset) const; virtual bool SelectWindowsPhoneToolset(std::string& toolset) const;
virtual bool SelectWindowsStoreToolset(std::string& toolset) const; virtual bool SelectWindowsStoreToolset(std::string& toolset) const;
const char* GetIDEVersion() override { return "10.0"; }
std::string const& GetMSBuildCommand(); std::string const& GetMSBuildCommand();
cmIDEFlagTable const* LoadFlagTable(std::string const& optionsName,
std::string const& toolsetName,
std::string const& defaultName,
std::string const& table) const;
std::string GeneratorToolset; std::string GeneratorToolset;
std::string GeneratorToolsetVersion; std::string GeneratorToolsetVersion;
std::string GeneratorToolsetHostArchitecture; std::string GeneratorToolsetHostArchitecture;
std::string GeneratorToolsetCuda; std::string GeneratorToolsetCuda;
std::string DefaultPlatformToolset; std::string DefaultPlatformToolset;
std::string DefaultPlatformToolsetHostArchitecture;
std::string WindowsTargetPlatformVersion; std::string WindowsTargetPlatformVersion;
std::string SystemName; std::string SystemName;
std::string SystemVersion; std::string SystemVersion;
std::string NsightTegraVersion; std::string NsightTegraVersion;
cmIDEFlagTable const* DefaultClFlagTable; std::string DefaultCLFlagTableName;
cmIDEFlagTable const* DefaultCSharpFlagTable; std::string DefaultCSharpFlagTableName;
cmIDEFlagTable const* DefaultLibFlagTable; std::string DefaultLibFlagTableName;
cmIDEFlagTable const* DefaultLinkFlagTable; std::string DefaultLinkFlagTableName;
cmIDEFlagTable const* DefaultCudaFlagTable; std::string DefaultCudaFlagTableName;
cmIDEFlagTable const* DefaultCudaHostFlagTable; std::string DefaultCudaHostFlagTableName;
cmIDEFlagTable const* DefaultMasmFlagTable; std::string DefaultMasmFlagTableName;
cmIDEFlagTable const* DefaultNasmFlagTable; std::string DefaultNasmFlagTableName;
cmIDEFlagTable const* DefaultRcFlagTable; std::string DefaultRCFlagTableName;
bool SystemIsWindowsCE; bool SystemIsWindowsCE;
bool SystemIsWindowsPhone; bool SystemIsWindowsPhone;
bool SystemIsWindowsStore; bool SystemIsWindowsStore;
private: private:
class Factory; class Factory;
friend class Factory;
struct LongestSourcePath struct LongestSourcePath
{ {
LongestSourcePath() LongestSourcePath()
: Length(0) : Length(0)
, Target(0) , Target(0)
, SourceFile(0) , SourceFile(0)
{ {
} }
size_t Length; size_t Length;
cmGeneratorTarget* Target; cmGeneratorTarget* Target;
 End of changes. 12 change blocks. 
17 lines changed or deleted 24 lines changed or added

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