diff options
| author | Brad King <brad.king@kitware.com> | 2001-03-08 22:38:46 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2001-03-08 22:38:46 (GMT) |
| commit | 670afe1fc03dc124f4ace55ecb5200510282f582 (patch) | |
| tree | 432d11ca0ad7c69c940df09f89c3704fede2fb54 | |
| parent | fe25e5873b636d631363499948379f588ab11d6a (diff) | |
| download | CMake-670afe1fc03dc124f4ace55ecb5200510282f582.zip CMake-670afe1fc03dc124f4ace55ecb5200510282f582.tar.gz CMake-670afe1fc03dc124f4ace55ecb5200510282f582.tar.bz2 | |
ENH: Added output of defines flags as part of INCLUDE_FLAGS.
| -rw-r--r-- | Source/cmUnixMakefileGenerator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx index bad24ac..e80d663 100644 --- a/Source/cmUnixMakefileGenerator.cxx +++ b/Source/cmUnixMakefileGenerator.cxx @@ -146,6 +146,7 @@ void cmUnixMakefileGenerator::OutputMakeFlags(std::ostream& fout) std::string include = *i; fout << "-I" << i->c_str() << " "; } + fout << m_Makefile->GetDefineFlags(); fout << " ${LOCAL_INCLUDE_FLAGS} "; fout << "\n"; fout << "default_target: all\n\n"; @@ -228,7 +229,7 @@ void cmUnixMakefileGenerator::OutputExecutableRules(std::ostream& fout) DotO += ".o"; fout << Classes[i].m_ClassName << ": " << DotO << " "; fout << "${CMAKE_DEPEND_LIBS}\n"; - fout << "\t${CXX} ${CXX_FLAGS} " << m_Makefile->GetDefineFlags() + fout << "\t${CXX} ${CXX_FLAGS} " << DotO.c_str() << " " << linkLibs.c_str() << " -o $@ ""\n\n"; |