[cmake-commits] king committed cmLocalGenerator.cxx 1.233 1.234
cmLocalGenerator.h 1.84 1.85 cmLocalUnixMakefileGenerator3.cxx
1.212 1.213 cmLocalUnixMakefileGenerator3.h 1.73 1.74
cmLocalVisualStudio6Generator.cxx 1.129 1.130
cmLocalVisualStudio6Generator.h 1.19 1.20
cmLocalVisualStudio7Generator.cxx 1.197 1.198
cmLocalVisualStudio7Generator.h 1.41 1.42
cmLocalXCodeGenerator.cxx 1.5 1.6 cmLocalXCodeGenerator.h 1.4 1.5
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Aug 1 15:25:42 EDT 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv5758
Modified Files:
cmLocalGenerator.cxx cmLocalGenerator.h
cmLocalUnixMakefileGenerator3.cxx
cmLocalUnixMakefileGenerator3.h
cmLocalVisualStudio6Generator.cxx
cmLocalVisualStudio6Generator.h
cmLocalVisualStudio7Generator.cxx
cmLocalVisualStudio7Generator.h cmLocalXCodeGenerator.cxx
cmLocalXCodeGenerator.h
Log Message:
ENH: Moved GetTargetDirectory method up to cmLocalGenerator. This provides a common interface to something that was implemented in most local generators anyway.
Index: cmLocalUnixMakefileGenerator3.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalUnixMakefileGenerator3.h,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- cmLocalUnixMakefileGenerator3.h 11 Jun 2007 16:40:40 -0000 1.73
+++ cmLocalUnixMakefileGenerator3.h 1 Aug 2007 19:25:40 -0000 1.74
@@ -188,7 +188,7 @@
void AppendEcho(std::vector<std::string>& commands, const char* text,
EchoColor color = EchoNormal);
- static std::string GetTargetDirectory(cmTarget& target);
+ virtual std::string GetTargetDirectory(cmTarget const& target) const;
// create a command that cds to the start dir then runs the commands
void CreateCDCommand(std::vector<std::string>& commands,
Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -d -r1.197 -r1.198
--- cmLocalVisualStudio7Generator.cxx 1 Aug 2007 15:39:51 -0000 1.197
+++ cmLocalVisualStudio7Generator.cxx 1 Aug 2007 19:25:40 -0000 1.198
@@ -1619,7 +1619,7 @@
//----------------------------------------------------------------------------
std::string cmLocalVisualStudio7Generator
-::GetTargetDirectory(cmTarget& target)
+::GetTargetDirectory(cmTarget const& target) const
{
std::string dir;
dir += target.GetName();
Index: cmLocalVisualStudio6Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio6Generator.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- cmLocalVisualStudio6Generator.h 11 Jun 2007 16:40:41 -0000 1.19
+++ cmLocalVisualStudio6Generator.h 1 Aug 2007 19:25:40 -0000 1.20
@@ -62,6 +62,7 @@
{
return this->CreatedProjectNames;
}
+ virtual std::string GetTargetDirectory(cmTarget const& target) const;
void GetTargetObjectFileDirectories(cmTarget* target,
std::vector<std::string>&
dirs);
Index: cmLocalVisualStudio7Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- cmLocalVisualStudio7Generator.h 18 Jun 2007 15:59:23 -0000 1.41
+++ cmLocalVisualStudio7Generator.h 1 Aug 2007 19:25:40 -0000 1.42
@@ -113,7 +113,7 @@
void WriteGroup(const cmSourceGroup *sg,
cmTarget target, std::ostream &fout,
const char *libName, std::vector<std::string> *configs);
- virtual std::string GetTargetDirectory(cmTarget&);
+ virtual std::string GetTargetDirectory(cmTarget const&) const;
cmVS7FlagTable const* ExtraFlagTable;
std::string ModuleDefinitionFile;
Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -d -r1.233 -r1.234
--- cmLocalGenerator.cxx 1 Aug 2007 17:04:45 -0000 1.233
+++ cmLocalGenerator.cxx 1 Aug 2007 19:25:40 -0000 1.234
@@ -2772,6 +2772,18 @@
}
return std::string(&arg[0]);
}
+
+//----------------------------------------------------------------------------
+std::string
+cmLocalGenerator::GetTargetDirectory(cmTarget const&) const
+{
+ cmSystemTools::Error("GetTargetDirectory"
+ " called on cmLocalGenerator");
+ return "";
+}
+
+
+//----------------------------------------------------------------------------
void
cmLocalGenerator::GetTargetObjectFileDirectories(cmTarget* ,
std::vector<std::string>&
Index: cmLocalVisualStudio6Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio6Generator.cxx,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- cmLocalVisualStudio6Generator.cxx 28 Jun 2007 13:09:26 -0000 1.129
+++ cmLocalVisualStudio6Generator.cxx 1 Aug 2007 19:25:40 -0000 1.130
@@ -1567,6 +1567,13 @@
}
}
+std::string
+cmLocalVisualStudio6Generator
+::GetTargetDirectory(cmTarget const&) const
+{
+ // No per-target directory for this generator (yet).
+ return "";
+}
void cmLocalVisualStudio6Generator
::GetTargetObjectFileDirectories(cmTarget* ,
Index: cmLocalXCodeGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalXCodeGenerator.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cmLocalXCodeGenerator.h 18 Jun 2007 15:59:23 -0000 1.4
+++ cmLocalXCodeGenerator.h 1 Aug 2007 19:25:40 -0000 1.5
@@ -35,6 +35,7 @@
void GetTargetObjectFileDirectories(cmTarget* target,
std::vector<std::string>&
dirs);
+ virtual std::string GetTargetDirectory(cmTarget const& target) const;
private:
};
Index: cmLocalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalUnixMakefileGenerator3.cxx,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- cmLocalUnixMakefileGenerator3.cxx 5 Jun 2007 20:35:24 -0000 1.212
+++ cmLocalUnixMakefileGenerator3.cxx 1 Aug 2007 19:25:40 -0000 1.213
@@ -1897,7 +1897,8 @@
//----------------------------------------------------------------------------
std::string
-cmLocalUnixMakefileGenerator3::GetTargetDirectory(cmTarget& target)
+cmLocalUnixMakefileGenerator3
+::GetTargetDirectory(cmTarget const& target) const
{
std::string dir = cmake::GetCMakeFilesDirectoryPostSlash();
dir += target.GetName();
Index: cmLocalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalXCodeGenerator.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cmLocalXCodeGenerator.cxx 18 Jun 2007 15:59:23 -0000 1.5
+++ cmLocalXCodeGenerator.cxx 1 Aug 2007 19:25:40 -0000 1.6
@@ -13,6 +13,13 @@
{
}
+std::string
+cmLocalXCodeGenerator::GetTargetDirectory(cmTarget const&) const
+{
+ // No per-target directory for this generator (yet).
+ return "";
+}
+
void cmLocalXCodeGenerator::
GetTargetObjectFileDirectories(cmTarget* target,
std::vector<std::string>&
Index: cmLocalGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.h,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- cmLocalGenerator.h 18 Jun 2007 15:59:23 -0000 1.84
+++ cmLocalGenerator.h 1 Aug 2007 19:25:40 -0000 1.85
@@ -236,6 +236,12 @@
std::string ConvertToRelativePath(const std::vector<std::string>& local,
const char* remote);
+ /**
+ * Get the relative path from the generator output directory to a
+ * per-target support directory.
+ */
+ virtual std::string GetTargetDirectory(cmTarget const& target) const;
+
protected:
/** Construct a comment for a custom command. */
More information about the Cmake-commits
mailing list