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

Merge topic 'vs-cleanup'

Browse Source 
78d9564d50 cmGlobalVisualStudio7Generator: Inline short method at only call site
034cc29b89 cmGlobalVisualStudio7Generator: Constify .sln write methods
5004602715 cmGlobalVisualStudio7Generator: Factor folder collection out of write method
6ae4ed30d9 cmGlobalVisualStudio7Generator: Factor target collection out of write method
5582eb292e cmGlobalVisualStudio7Generator: Update outdated comment
2297ba9399 cmGlobalVisualStudio7Generator: Remove redundant C++ modules check
ccbd61dd53 cmGlobalVisualStudio7Generator: Remove unused member
93e34a5e0e cmGlobalGenerator: Constify GetTargetDirectDepends
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11130
This commit is contained in:
Brad King
2025-09-02 14:55:51 +00:00
committed by Kitware Robot
parent f70a8f890b 78d9564d50
commit 54e7008e2d
13 changed files with 141 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
Source/cmGlobalVisualStudio7Generator.h
View File

@@ -82,13 +82,8 @@ public:
std::vector<std::string> const& makeOptions =
std::vector<std::string>()) override;
/**
* Generate the DSW workspace file.
*/
virtual void OutputSLNFile();
//! Lookup a stored GUID or compute one deterministically.
std::string GetGUID(std::string const& name);
std::string GetGUID(std::string const& name) const;
/** Append the subdirectory for the given configuration. */
void AppendDirectoryForConfig(std::string const& prefix,
@@ -134,6 +129,12 @@ protected:
void Generate() override;
struct VSFolders
{
std::map<std::string, cmVisualStudioFolder> Folders;
cmVisualStudioFolder* Create(std::string const& path);
};
std::string const& GetDevEnvCommand();
virtual std::string FindDevEnvCommand();
@@ -141,60 +142,61 @@ protected:
virtual void OutputSLNFile(cmLocalGenerator* root,
std::vector<cmLocalGenerator*>& generators);
virtual void WriteSLNFile(std::ostream& fout, cmLocalGenerator* root,
std::vector<cmLocalGenerator*>& generators) = 0;
virtual void WriteSLNFile(
std::ostream& fout, cmLocalGenerator* root,
OrderedTargetDependSet const& orderedProjectTargets,
VSFolders const& vsFolders) const = 0;
virtual void WriteProject(std::ostream& fout, std::string const& name,
std::string const& path,
cmGeneratorTarget const* t) = 0;
cmGeneratorTarget const* t) const = 0;
virtual void WriteProjectDepends(std::ostream& fout, std::string const& name,
std::string const& path,
cmGeneratorTarget const* t) = 0;
cmGeneratorTarget const* t) const = 0;
virtual void WriteProjectConfigurations(
std::ostream& fout, std::string const& name,
cmGeneratorTarget const& target, std::vector<std::string> const& configs,
std::set<std::string> const& configsPartOfDefaultBuild,
std::string const& platformMapping = "") = 0;
std::string const& platformMapping = "") const = 0;
virtual void WriteSLNGlobalSections(std::ostream& fout,
cmLocalGenerator* root);
virtual void WriteSLNFooter(std::ostream& fout);
cmLocalGenerator* root) const;
virtual void WriteSLNFooter(std::ostream& fout) const;
std::string WriteUtilityDepend(cmGeneratorTarget const* target) override;
cmVisualStudioFolder* CreateSolutionFolders(std::string const& path);
VSFolders CreateSolutionFolders(
OrderedTargetDependSet const& orderedProjectTargets);
virtual void WriteTargetsToSolution(
std::ostream& fout, cmLocalGenerator* root,
OrderedTargetDependSet const& projectTargets);
OrderedTargetDependSet const& projectTargets) const;
virtual void WriteTargetConfigurations(
std::ostream& fout, std::vector<std::string> const& configs,
OrderedTargetDependSet const& projectTargets);
OrderedTargetDependSet const& projectTargets) const;
virtual void WriteExternalProject(
std::ostream& fout, std::string const& name, std::string const& path,
cmValue typeGuid,
std::set<BT<std::pair<std::string, bool>>> const& dependencies) = 0;
std::set<BT<std::pair<std::string, bool>>> const& dependencies) const = 0;
std::string ConvertToSolutionPath(std::string const& path);
std::string ConvertToSolutionPath(std::string const& path) const;
std::set<std::string> IsPartOfDefaultBuild(
std::vector<std::string> const& configs,
OrderedTargetDependSet const& projectTargets,
cmGeneratorTarget const* target);
cmGeneratorTarget const* target) const;
bool IsDependedOn(OrderedTargetDependSet const& projectTargets,
cmGeneratorTarget const* target);
cmGeneratorTarget const* target) const;
std::map<std::string, std::string> GUIDMap;
virtual void WriteFolders(std::ostream& fout);
virtual void WriteFoldersContent(std::ostream& fout);
virtual void WriteFolders(std::ostream& fout,
VSFolders const& vsFolders) const;
virtual void WriteFoldersContent(std::ostream& fout,
VSFolders const& vsFolders) const;
virtual void AddSolutionItems(cmLocalGenerator* root) = 0;
virtual void AddSolutionItems(cmLocalGenerator* root,
VSFolders& vsFolders) = 0;
virtual void WriteFolderSolutionItems(
std::ostream& fout, cmVisualStudioFolder const& folder) = 0;
std::ostream& fout, cmVisualStudioFolder const& folder) const = 0;
std::map<std::string, cmVisualStudioFolder> VisualStudioFolders;
// Set during OutputSLNFile with the name of the current project.
// There is one SLN file per project.
std::string CurrentProject;
bool MarmasmEnabled;
bool MasmEnabled;
bool NasmEnabled;