summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.h
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2004-03-09 21:28:44 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2004-03-09 21:28:44 (GMT)
commitddb815c12542f80f42562877298a73fab39bb4ca (patch)
tree825a90988e4710274a656b8f9bf7f32b7d0827fa /Source/cmMakefile.h
parentbf699505bc7fc378abf07ec4dfa0f0cc4fb89686 (diff)
downloadCMake-ddb815c12542f80f42562877298a73fab39bb4ca.zip
CMake-ddb815c12542f80f42562877298a73fab39bb4ca.tar.gz
CMake-ddb815c12542f80f42562877298a73fab39bb4ca.tar.bz2
ENH: add new subdirectory exclude from top option
Diffstat (limited to 'Source/cmMakefile.h')
-rw-r--r--Source/cmMakefile.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index faa4986..dbfe6a6 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -203,7 +203,7 @@ public:
/**
* Add a subdirectory to the build.
*/
- void AddSubDirectory(const char*);
+ void AddSubDirectory(const char*, bool includeTopLevel=true);
/**
* Add an include directory to the build.
@@ -409,7 +409,7 @@ public:
/**
* Get a list of the build subdirectories.
*/
- const std::vector<std::string>& GetSubDirectories()
+ const std::vector<std::pair<cmStdString, bool> >& GetSubDirectories()
{
return m_SubDirectories;
}
@@ -658,7 +658,7 @@ protected:
cmTargets m_Targets;
std::vector<cmSourceFile*> m_SourceFiles;
- std::vector<std::string> m_SubDirectories; // list of sub directories
+ std::vector<std::pair<cmStdString, bool> > m_SubDirectories; // list of sub directories
struct StringSet : public std::set<cmStdString>
{
};
@@ -695,6 +695,7 @@ private:
void ReadSources(std::ifstream& fin, bool t);
friend class cmMakeDepend; // make depend needs direct access
// to the m_Sources array
+ void PrintStringVector(const char* s, const std::vector<std::pair<cmStdString, bool> >& v) const;
void PrintStringVector(const char* s, const std::vector<std::string>& v) const;
void AddDefaultDefinitions();
std::list<cmFunctionBlocker *> m_FunctionBlockers;