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 bde6c5547e181b72aaefbaffff092bdd9a79ba01 (commit)
via a15e375cddb415ebe89aa5896d783b821aca940c (commit)
from 683f5b178974acfe2d387e2ab0a4040ed023b51e (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bde6c5547e181b72aaefbaffff092bdd9a79ba01
commit bde6c5547e181b72aaefbaffff092bdd9a79ba01
Merge: 683f5b1 a15e375
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Tue Jan 19 16:06:07 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jan 19 16:06:07 2016 -0500
Merge topic 'mfc-utility-targets' into next
a15e375c Fix MFC setting on utility targets (#15867)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a15e375cddb415ebe89aa5896d783b821aca940c
commit a15e375cddb415ebe89aa5896d783b821aca940c
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Tue Jan 19 14:01:08 2016 -0700
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Tue Jan 19 14:04:15 2016 -0700
Fix MFC setting on utility targets (#15867)
Multi-byte MFC is deprecated, and some projects will not compile if MFC is
enabled.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index 27ae685..09d4a90 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -762,13 +762,16 @@ void cmVisualStudio10TargetGenerator
std::string mfcFlagValue = mfcFlag ? mfcFlag : "0";
std::string useOfMfcValue = "false";
- if(mfcFlagValue == "1")
- {
- useOfMfcValue = "Static";
- }
- else if(mfcFlagValue == "2")
+ if(this->GeneratorTarget->GetType() <= cmState::OBJECT_LIBRARY)
{
- useOfMfcValue = "Dynamic";
+ if(mfcFlagValue == "1")
+ {
+ useOfMfcValue = "Static";
+ }
+ else if(mfcFlagValue == "2")
+ {
+ useOfMfcValue = "Dynamic";
+ }
}
std::string mfcLine = "<UseOfMfc>";
mfcLine += useOfMfcValue + "</UseOfMfc>\n";
-----------------------------------------------------------------------
Summary of changes:
Source/cmVisualStudio10TargetGenerator.cxx | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
