diff options
| author | Brad King <brad.king@kitware.com> | 2005-02-24 21:19:42 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2005-02-24 21:19:42 (GMT) |
| commit | ea5f13fc8288a4a872ca94feb40c6a302ed83144 (patch) | |
| tree | a61bf6fda9adb804201774cbbcda547d3976470d /Source | |
| parent | cb48e0c16178738c3d3bafd551f0f3e0b906c6c1 (diff) | |
| download | CMake-ea5f13fc8288a4a872ca94feb40c6a302ed83144.zip CMake-ea5f13fc8288a4a872ca94feb40c6a302ed83144.tar.gz CMake-ea5f13fc8288a4a872ca94feb40c6a302ed83144.tar.bz2 | |
BUG: The path to the source file in a compile line should be made relative only when CMAKE_USE_RELATIVE_PATHS is on.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator2.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator2.cxx b/Source/cmLocalUnixMakefileGenerator2.cxx index 2a2aeae..996e42e 100644 --- a/Source/cmLocalUnixMakefileGenerator2.cxx +++ b/Source/cmLocalUnixMakefileGenerator2.cxx @@ -48,7 +48,6 @@ cmLocalUnixMakefileGenerator2::cmLocalUnixMakefileGenerator2() m_MakefileVariableSize = 0; m_IgnoreLibPrefix = false; m_PassMakeflags = false; - m_UseRelativePaths = false; } //---------------------------------------------------------------------------- @@ -580,7 +579,7 @@ cmLocalUnixMakefileGenerator2 // Get the output paths for source and object files. std::string sourceFile = - this->ConvertToRelativeOutputPath(source.GetFullPath().c_str()); + this->ConvertToOptionallyRelativeOutputPath(source.GetFullPath().c_str()); std::string objectFile = this->ConvertToRelativeOutputPath(obj.c_str()); @@ -2321,9 +2320,6 @@ cmLocalUnixMakefileGenerator2::ConvertToRelativeOutputPath(const char* p) //---------------------------------------------------------------------------- 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. if(const char* libOut = m_Makefile->GetDefinition("LIBRARY_OUTPUT_PATH")) { |