kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: The path to the source file in a compile line should be made relative only when CMAKE_USE_RELATIVE_PATHS is on.

This commit is contained in:
Brad King 2005-02-24 16:19:42 -05:00
parent cb48e0c161
commit ea5f13fc82
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmLocalUnixMakefileGenerator2.cxx
View File

@ -48,7 +48,6 @@ cmLocalUnixMakefileGenerator2::cmLocalUnixMakefileGenerator2()
m_MakefileVariableSize = 0; m_MakefileVariableSize = 0;
m_IgnoreLibPrefix = false; m_IgnoreLibPrefix = false;
m_PassMakeflags = false; m_PassMakeflags = false;
m_UseRelativePaths = false;
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -580,7 +579,7 @@ cmLocalUnixMakefileGenerator2
// Get the output paths for source and object files. // Get the output paths for source and object files.
std::string sourceFile = std::string sourceFile =
this->ConvertToRelativeOutputPath(source.GetFullPath().c_str()); this->ConvertToOptionallyRelativeOutputPath(source.GetFullPath().c_str());
std::string objectFile = std::string objectFile =
this->ConvertToRelativeOutputPath(obj.c_str()); this->ConvertToRelativeOutputPath(obj.c_str());
@ -2321,9 +2320,6 @@ cmLocalUnixMakefileGenerator2::ConvertToRelativeOutputPath(const char* p)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmLocalUnixMakefileGenerator2::ConfigureOutputPaths() void cmLocalUnixMakefileGenerator2::ConfigureOutputPaths()
{ {
// Save whether to use relative paths.
m_UseRelativePaths = m_Makefile->IsOn("CMAKE_USE_RELATIVE_PATHS");
// Format the library and executable output paths. // Format the library and executable output paths.
if(const char* libOut = m_Makefile->GetDefinition("LIBRARY_OUTPUT_PATH")) if(const char* libOut = m_Makefile->GetDefinition("LIBRARY_OUTPUT_PATH"))
{ {