[Cmake-commits] CMake branch, next, updated. v2.8.9-229-gdb76019

Brad King brad.king at kitware.com
Wed Aug 22 09:07:52 EDT 2012


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  db76019bf92ed8b6b6e5bccfb0cf7eb704ad12b1 (commit)
       via  f0ae381c73dd2b421cb7df407152ad4498428fc2 (commit)
      from  04d9fc1f04b7153bf733076b67e4a852e4ecba5f (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=db76019bf92ed8b6b6e5bccfb0cf7eb704ad12b1
commit db76019bf92ed8b6b6e5bccfb0cf7eb704ad12b1
Merge: 04d9fc1 f0ae381
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 22 09:07:44 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 22 09:07:44 2012 -0400

    Merge topic 'VS10-PrecompiledHeader-default' into next
    
    f0ae381 VS: Disable precompiled headers unless enabled by project (#12930)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0ae381c73dd2b421cb7df407152ad4498428fc2
commit f0ae381c73dd2b421cb7df407152ad4498428fc2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 22 08:50:50 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 22 08:57:10 2012 -0400

    VS: Disable precompiled headers unless enabled by project (#12930)
    
    In VS 11 the WindowsAppContainer element enabled by the
    VS_WINRT_EXTENSIONS property activates precompiled header support
    automatically if no PrecompiledHeader setting is specified.  For VS 10 and
    11 set PrecompiledHeader to "NotUsing" explicitly by default unless
    overridden by a project-specified flag.
    
    Suggested-by: Eugene Golushkov <eugene_gff at ukr.net>

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 6626e5b..2442841 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1219,6 +1219,7 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
   // Get preprocessor definitions for this directory.
   std::string defineFlags = this->Target->GetMakefile()->GetDefineFlags();
   clOptions.FixExceptionHandlingDefault();
+  clOptions.AddFlag("PrecompiledHeader", "NotUsing");
   clOptions.Parse(flags.c_str());
   clOptions.Parse(defineFlags.c_str());
   clOptions.AddDefines

-----------------------------------------------------------------------

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list