This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via a885c0574474456fd1b1ef93d2bfd3b33176470f (commit) via 555bda4e436435c37690aa5f31f4d254793d5b4e (commit) from e52f9b579140ca254fde41fb6f71a8a2444261ea (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a885c0574474456fd1b1ef93d2bfd3b33176470f commit a885c0574474456fd1b1ef93d2bfd3b33176470f Merge: e52f9b5 555bda4 Author: David Cole <david.c...@kitware.com> AuthorDate: Thu Jun 14 15:19:34 2012 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Jun 14 15:19:34 2012 -0400 Merge topic 'ninja-cldeps' into next 555bda4 Ninja: Restructure code to work with the Borland compilers http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=555bda4e436435c37690aa5f31f4d254793d5b4e commit 555bda4e436435c37690aa5f31f4d254793d5b4e Author: David Cole <david.c...@kitware.com> AuthorDate: Thu Jun 14 13:39:39 2012 -0400 Commit: David Cole <david.c...@kitware.com> CommitDate: Thu Jun 14 13:39:39 2012 -0400 Ninja: Restructure code to work with the Borland compilers Should fix the Borland dashboard errors. diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index 22f77f0..2dcfcb3 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -391,12 +391,18 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement() // Compute architecture specific link flags. Yes, these go into a different // variable for executables, probably due to a mistake made when duplicating // code between the Makefile executable and library generators. - locGtor->AddArchitectureFlags(targetType == cmTarget::EXECUTABLE + std::string flags = (targetType == cmTarget::EXECUTABLE ? vars["FLAGS"] - : vars["ARCH_FLAGS"], + : vars["ARCH_FLAGS"]); + locGtor->AddArchitectureFlags(flags, this->GetTarget(), this->TargetLinkLanguage, this->GetConfigName()); + if (targetType == cmTarget::EXECUTABLE) { + vars["FLAGS"] = flags; + } else { + vars["ARCH_FLAGS"] = flags; + } if (this->GetTarget()->HasSOName(this->GetConfigName())) { vars["SONAME_FLAG"] = this->GetMakefile()->GetSONameFlag(this->TargetLinkLanguage); ----------------------------------------------------------------------- Summary of changes: Source/cmNinjaNormalTargetGenerator.cxx | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits