diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2001-05-22 17:22:30 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2001-05-22 17:22:30 (GMT) |
| commit | beaa7dc1c84a58063f72c54559ecf0b2b45de45c (patch) | |
| tree | d652bfb87b09db966bda4fc6acdd58b29f656e8c /Source | |
| parent | 69503c66eb8225b57b5e8968f2d58d646bcf3191 (diff) | |
| download | CMake-beaa7dc1c84a58063f72c54559ecf0b2b45de45c.zip CMake-beaa7dc1c84a58063f72c54559ecf0b2b45de45c.tar.gz CMake-beaa7dc1c84a58063f72c54559ecf0b2b45de45c.tar.bz2 | |
BUG: fix depends and CXXFLAGS passing
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Makefile.in | 2 | ||||
| -rw-r--r-- | Source/cmUnixMakefileGenerator.cxx | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Source/Makefile.in b/Source/Makefile.in index 9daeac0..aa99b5d 100644 --- a/Source/Makefile.in +++ b/Source/Makefile.in @@ -3,7 +3,7 @@ VPATH = @srcdir@ CMAKE_CONFIG_DIR = @CMAKE_CONFIG_DIR@ CXX = @CXX@ -CXXFLAGS = -DCMAKE_ROOT_DIR='"@CMAKE_ROOT_DIR@"' @CXXFLAGS@ -DCMAKE_HAS_AUTOCONF -I${CMAKE_CONFIG_DIR}/Source +CXXFLAGS = @CXXFLAGS@ -DCMAKE_ROOT_DIR='"@CMAKE_ROOT_DIR@"' @CXXFLAGS@ -DCMAKE_HAS_AUTOCONF -I${CMAKE_CONFIG_DIR}/Source .SUFFIXES: .cxx .java .class diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx index 344871b..ff3d29e 100644 --- a/Source/cmUnixMakefileGenerator.cxx +++ b/Source/cmUnixMakefileGenerator.cxx @@ -133,11 +133,10 @@ void cmUnixMakefileGenerator::OutputMakefile(const char* file) this->OutputDependencies(fout); this->OutputTargets(fout); this->OutputSubDirectoryRules(fout); - std::string dependName; + std::string dependName = m_Makefile->GetStartOutputDirectory(); + dependName += "/cmake.depends"; if(!this->m_CacheOnly) { - dependName = m_Makefile->GetStartOutputDirectory(); - dependName += "/cmake.depends"; std::ofstream dependout(dependName.c_str()); if(!dependout) { |