summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalVisualStudio7Generator.h
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2011-07-29 14:22:33 (GMT)
committerDavid Cole <david.cole@kitware.com>2011-07-29 14:22:33 (GMT)
commit37d8602cdee0bdef29f1886fc83f48569addcbd7 (patch)
tree26219b5523649a150bc176ff39254c5a80d64ddb /Source/cmLocalVisualStudio7Generator.h
parentdf9577259ca5a30f5c79baee038fe42e25b4a1e5 (diff)
parent6c72d25aee92c6cd412c79969b7b18a814ac99cb (diff)
downloadCMake-37d8602cdee0bdef29f1886fc83f48569addcbd7.zip
CMake-37d8602cdee0bdef29f1886fc83f48569addcbd7.tar.gz
CMake-37d8602cdee0bdef29f1886fc83f48569addcbd7.tar.bz2
Merge topic 'intel_fortran_vs2010' into fix-8707-add-vs-globals
Conflicts: Source/cmLocalVisualStudio7Generator.h
Diffstat (limited to 'Source/cmLocalVisualStudio7Generator.h')
-rw-r--r--Source/cmLocalVisualStudio7Generator.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.h b/Source/cmLocalVisualStudio7Generator.h
index 4fdbc58..35f659f 100644
--- a/Source/cmLocalVisualStudio7Generator.h
+++ b/Source/cmLocalVisualStudio7Generator.h
@@ -75,6 +75,8 @@ public:
virtual void ReadAndStoreExternalGUID(const char* name,
const char* path);
+protected:
+ void CreateSingleVCProj(const char *lname, cmTarget &tgt);
private:
typedef cmVisualStudioGeneratorOptions Options;
typedef cmLocalVisualStudio7GeneratorFCInfo FCInfo;
@@ -85,7 +87,6 @@ private:
void WriteVCProjHeader(std::ostream& fout, const char *libName,
cmTarget &tgt, std::vector<cmSourceGroup> &sgs);
void WriteVCProjFooter(std::ostream& fout, cmTarget &target);
- void CreateSingleVCProj(const char *lname, cmTarget &tgt);
void WriteVCProjFile(std::ostream& fout, const char *libName,
cmTarget &tgt);
void WriteConfigurations(std::ostream& fout,