[Cmake-commits] CMake branch, next, updated. v2.8.12-4396-gf55f0ff

[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  f55f0ff4a05ed29d55965f7568633b06947c2527 (commit)
       via  de38a38c05c94ba8145d229b9595da3fbc004aae (commit)
       via  a6f8a11178043439cd68030011ac95063966502a (commit)
      from  004064daffec516e69da96befd5279dbb26048c4 (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=f55f0ff4a05ed29d55965f7568633b06947c2527
commit f55f0ff4a05ed29d55965f7568633b06947c2527
Merge: 004064d de38a38
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 24 02:41:18 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 24 02:41:18 2013 -0400

    Merge topic 'compatible-interface-numbers' into next
    
    de38a38 Workaround MSVC6 template limitation.
    a6f8a11 Introduce cmM{ax,in}imum macros to work around MSVC6


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de38a38c05c94ba8145d229b9595da3fbc004aae
commit de38a38c05c94ba8145d229b9595da3fbc004aae
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 24 08:39:53 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 24 08:39:53 2013 +0200

    Workaround MSVC6 template limitation.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 04d13f3..c42ba95 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -4541,14 +4541,14 @@ const char* consistentProperty(const char *lhs, const char *rhs,
 }
 
 template<typename PropertyType>
-PropertyType impliedValue();
+PropertyType impliedValue(PropertyType);
 template<>
-bool impliedValue<bool>()
+bool impliedValue<bool>(bool)
 {
   return false;
 }
 template<>
-const char* impliedValue<const char*>()
+const char* impliedValue<const char*>(const char*)
 {
   return "";
 }
@@ -4632,7 +4632,7 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget *tgt,
       }
     else if (impliedByUse)
       {
-      propContent = impliedValue<PropertyType>();
+      propContent = impliedValue<PropertyType>(propContent);
       if (ifaceIsSet)
         {
         PropertyType consistent = consistentProperty(propContent,

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a6f8a11178043439cd68030011ac95063966502a
commit a6f8a11178043439cd68030011ac95063966502a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 24 08:36:58 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 24 08:39:16 2013 +0200

    Introduce cmM{ax,in}imum macros to work around MSVC6

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index ca743d8..04d13f3 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -4476,6 +4476,16 @@ const char * consistentStringProperty(const char *lhs, const char *rhs)
   return strcmp(lhs, rhs) == 0 ? lhs : 0;
 }
 
+#if defined(_MSC_VER) && _MSC_VER <= 1200
+template<typename T> const T&
+cmMaximum(const T& l, const T& r) {return l > r ? l : r;}
+template<typename T> const T&
+cmMinimum(const T& l, const T& r) {return l < r ? l : r;}
+#else
+#define cmMinimum std::min
+#define cmMaximum std::max
+#endif
+
 //----------------------------------------------------------------------------
 const char * consistentNumberProperty(const char *lhs, const char *rhs,
                                CompatibleType t)
@@ -4490,11 +4500,11 @@ const char * consistentNumberProperty(const char *lhs, const char *rhs,
 
   if (t == NumberMaxType)
     {
-    return std::max(lnum, rnum) == lnum ? lhs : rhs;
+    return cmMaximum(lnum, rnum) == lnum ? lhs : rhs;
     }
   else
     {
-    return std::min(lnum, rnum) == lnum ? lhs : rhs;
+    return cmMinimum(lnum, rnum) == lnum ? lhs : rhs;
     }
 }
 

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

Summary of changes:
 Source/cmTarget.cxx |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake