[Cmake-commits] CMake branch, next, updated. v3.2.0-846-gdc6cebe

[Stephen Kelly]

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  dc6cebe35f74b2fbc1b99434d04e454bdb6525f7 (commit)
       via  95a6a4bdc8736745e129e510c91a76f41d1cb0d7 (commit)
      from  4f61b2ad49cc88e7a6a256cad88abba01f3b0b12 (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=dc6cebe35f74b2fbc1b99434d04e454bdb6525f7
commit dc6cebe35f74b2fbc1b99434d04e454bdb6525f7
Merge: 4f61b2a 95a6a4b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Mar 5 13:57:48 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 5 13:57:48 2015 -0500

    Merge topic 'target-language-genex' into next
    
    95a6a4bd Use link language.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95a6a4bdc8736745e129e510c91a76f41d1cb0d7
commit 95a6a4bdc8736745e129e510c91a76f41d1cb0d7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Mar 5 19:57:15 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Mar 5 19:57:15 2015 +0100

    Use link language.

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 5c43f46..db59da9 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1779,12 +1779,15 @@ void cmLocalVisualStudio6Generator
     std::set<std::string> minsizeDefinesSet;
     std::set<std::string> debugrelDefinesSet;
 
-    this->AddCompileDefinitions(definesSet, &target, "", "C");
-    this->AddCompileDefinitions(debugDefinesSet, &target, "DEBUG", "C");
-    this->AddCompileDefinitions(releaseDefinesSet, &target, "RELEASE", "C");
-    this->AddCompileDefinitions(minsizeDefinesSet, &target, "MINSIZEREL", "C");
+    this->AddCompileDefinitions(definesSet, &target, "", linkLanguage);
+    this->AddCompileDefinitions(debugDefinesSet, &target,
+                                "DEBUG", linkLanguage);
+    this->AddCompileDefinitions(releaseDefinesSet, &target,
+                                "RELEASE", linkLanguage);
+    this->AddCompileDefinitions(minsizeDefinesSet, &target,
+                                "MINSIZEREL", linkLanguage);
     this->AddCompileDefinitions(debugrelDefinesSet, &target,
-                                "RELWITHDEBINFO", "C");
+                                "RELWITHDEBINFO", linkLanguage);
 
     std::string defines = " ";
     std::string debugDefines = " ";

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

Summary of changes:
 Source/cmLocalVisualStudio6Generator.cxx |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake