View Issue Details [ Jump to Notes ]

Project

Tags

No tags attached.

0001-BUG-0011224-fixed-MFC-build-in-VS2010.patch [^] (1,387 bytes) 2010-10-09 13:34 [Show Content] [Hide Content]

From e70355a3288383dbde9376863cc8debb03314e7f Mon Sep 17 00:00:00 2001
From: McBen <viertelvor12@gmx.net>
Date: Sat, 9 Oct 2010 19:25:14 +0200
Subject: [PATCH] BUG 0011224: fixed MFC build in VS2010

---
 Source/cmVisualStudio10TargetGenerator.cxx |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index e61f416..9c2beba 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -275,13 +275,12 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues()
     this->WriteString(configType.c_str(), 2); 
     const char* mfcFlag = 
       this->Target->GetMakefile()->GetDefinition("CMAKE_MFC_FLAG");
-    if(mfcFlag)
+    switch (atoi(mfcFlag))
       {
-      this->WriteString("<UseOfMfc>true</UseOfMfc>\n", 2);
-      }
-    else
-      {
-      this->WriteString("<UseOfMfc>false</UseOfMfc>\n", 2);
+            case 1: this->WriteString("<UseOfMfc>Static</UseOfMfc>\n", 2); break;
+            case 2: this->WriteString("<UseOfMfc>Dynamic</UseOfMfc>\n", 2); break;
+            default:
+              this->WriteString("<UseOfMfc>false</UseOfMfc>\n", 2);
       }
     if(this->Target->GetType() <= cmTarget::MODULE_LIBRARY &&
        this->ClOptions[*i]->UsingUnicode())
-- 
1.7.2.3.msysgit.0

0001-BUG-0011224-fixed-MFC-build-in-VS2010_b.patch [^] (1,397 bytes) 2010-10-18 14:38 [Show Content] [Hide Content]

From 902c5bd70815e96e2fa28e10e940357ec0573429 Mon Sep 17 00:00:00 2001
From: McBen <viertelvor12@gmx.net>
Date: Sat, 9 Oct 2010 19:25:14 +0200
Subject: [PATCH] BUG 0011224: fixed MFC build in VS2010

---
 Source/cmVisualStudio10TargetGenerator.cxx |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 1e73143..837ba30 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -275,13 +275,12 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues()
     this->WriteString(configType.c_str(), 2); 
     const char* mfcFlag = 
       this->Target->GetMakefile()->GetDefinition("CMAKE_MFC_FLAG");
-    if(mfcFlag)
+    switch (mfcFlag?atoi(mfcFlag):0)
       {
-      this->WriteString("<UseOfMfc>true</UseOfMfc>\n", 2);
-      }
-    else
-      {
-      this->WriteString("<UseOfMfc>false</UseOfMfc>\n", 2);
+            case 1: this->WriteString("<UseOfMfc>Static</UseOfMfc>\n", 2); break;
+            case 2: this->WriteString("<UseOfMfc>Dynamic</UseOfMfc>\n", 2); break;
+            default:
+              this->WriteString("<UseOfMfc>false</UseOfMfc>\n", 2);
       }
     if(this->Target->GetType() <= cmTarget::MODULE_LIBRARY &&
        this->ClOptions[*i]->UsingUnicode())
-- 
1.7.2.3.msysgit.0

Relationships

related to	0011213	closed	David Cole	VC2010 Generator handles CMAKE_MFC_FLAG incorrectly
related to	0011638	closed	Kitware Robot	ATL support

Notes
(0022463) McBen (reporter) 2010-10-09 13:38	The tag "<UseOfMfc>" has 3 states: false,Static,Dynamic CMake incorrectly only writes false or true. I attached a possible patched for that.

(0022524) McBen (reporter) 2010-10-18 14:40	new patch added. 'cause I missed a NULL_pointer check in my first patch. ( "0001-BUG-0011224-fixed-MFC-build-in-VS2010.patch" can be deleted )

(0024321) David Cole (manager) 2010-12-22 09:46	Here's another case where a lack of a test is a contributing factor to the bug going unobserved by CMake developers. If there were a test that built an MFC project, then the test would fail on Visual Studio 2010 dashboard submissions.

(0025784) ThomasZymara (reporter) 2011-03-15 10:07	I just verified your fix and it worked

(0027520) Gunther Laure (reporter) 2011-10-04 05:34	Are we forced to apply this patch on our own or will it be added to a CMake release soon?

(0027722) David Cole (manager) 2011-11-04 13:43	Fix pushed to 'next': http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=011694c269a1193ec8f7fe8dce8d4a86bcafa8e4 [^]

(0027725) David Cole (manager) 2011-11-04 13:45	Note also, the MFC test was added and patched up to work on all the dashboard machines in all the commits leading up to this fix commit...

(0029039) David Cole (manager) 2012-04-02 10:10	Closing resolved issues that have not been updated in more than 4 months.

Issue History
Date Modified	Username	Field	Change
2010-09-13 08:41	ThomasZymara	New Issue
2010-10-09 13:34	McBen	File Added: 0001-BUG-0011224-fixed-MFC-build-in-VS2010.patch
2010-10-09 13:38	McBen	Note Added: 0022463
2010-10-18 14:38	McBen	File Added: 0001-BUG-0011224-fixed-MFC-build-in-VS2010_b.patch
2010-10-18 14:40	McBen	Note Added: 0022524
2010-12-22 09:40	David Cole	Relationship added	related to 0011213
2010-12-22 09:42	David Cole	Relationship added	related to 0011638
2010-12-22 09:46	David Cole	Note Added: 0024321
2010-12-22 09:47	David Cole	Assigned To	=> David Cole
2010-12-22 09:47	David Cole	Status	new => assigned
2011-03-15 10:07	ThomasZymara	Note Added: 0025784
2011-10-04 05:34	Gunther Laure	Note Added: 0027520
2011-10-21 12:21	David Cole	Target Version	=> CMake 2.8.7
2011-11-04 13:43	David Cole	Note Added: 0027722
2011-11-04 13:43	David Cole	Status	assigned => resolved
2011-11-04 13:43	David Cole	Fixed in Version	=> CMake 2.8.7
2011-11-04 13:43	David Cole	Resolution	open => fixed
2011-11-04 13:45	David Cole	Note Added: 0027725
2012-04-02 10:10	David Cole	Note Added: 0029039
2012-04-02 10:10	David Cole	Status	resolved => closed