[cmake-commits] king committed cmLocalUnixMakefileGenerator3.cxx
1.202 1.203
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Mar 16 15:48:29 EST 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv8960
Modified Files:
cmLocalUnixMakefileGenerator3.cxx
Log Message:
BUG: Need to include relative path top information in directory information so that relative path conversion during dependency generation works with the same rules as project generation.
Index: cmLocalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalUnixMakefileGenerator3.cxx,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -d -r1.202 -r1.203
--- cmLocalUnixMakefileGenerator3.cxx 16 Mar 2007 14:34:25 -0000 1.202
+++ cmLocalUnixMakefileGenerator3.cxx 16 Mar 2007 20:48:27 -0000 1.203
@@ -411,6 +411,15 @@
// Write the do not edit header.
this->WriteDisclaimer(infoFileStream);
+ // Setup relative path conversion tops.
+ infoFileStream
+ << "# Relative path conversion top directories.\n"
+ << "SET(CMAKE_RELATIVE_PATH_TOP_SOURCE \"" << this->RelativePathTopSource
+ << "\")\n"
+ << "SET(CMAKE_RELATIVE_PATH_TOP_BINARY \"" << this->RelativePathTopBinary
+ << "\")\n"
+ << "\n";
+
// Tell the dependency scanner to use unix paths if necessary.
if(cmSystemTools::GetForceUnixPaths())
{
@@ -1155,10 +1164,11 @@
{
cmSystemTools::Error("Target DependInfo.cmake file not found");
}
-
- // Test whether we need to force Unix paths.
+
+ // Lookup useful directory information.
if(haveDirectoryInfo)
{
+ // Test whether we need to force Unix paths.
if(const char* force = mf->GetDefinition("CMAKE_FORCE_UNIX_PATHS"))
{
if(!cmSystemTools::IsOff(force))
@@ -1166,6 +1176,19 @@
cmSystemTools::SetForceUnixPaths(true);
}
}
+
+ // Setup relative path top directories.
+ this->RelativePathsConfigured = true;
+ if(const char* relativePathTopSource =
+ mf->GetDefinition("CMAKE_RELATIVE_PATH_TOP_SOURCE"))
+ {
+ this->RelativePathTopSource = relativePathTopSource;
+ }
+ if(const char* relativePathTopBinary =
+ mf->GetDefinition("CMAKE_RELATIVE_PATH_TOP_BINARY"))
+ {
+ this->RelativePathTopBinary = relativePathTopBinary;
+ }
}
else
{
More information about the Cmake-commits
mailing list