[Cmake-commits] CMake branch, next, updated. v2.8.4-1138-gc745098

[Alexander Neundorf]

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  c745098e23a6d3e437cbb52ce76669eb066a38fb (commit)
       via  968d5a0ff17f13867472c857fcbda688d855857c (commit)
       via  1a91ac4d0dd9bb7eac960a2058fd26f0646b4f50 (commit)
      from  ca37b807f30177828b88eeb948b89888ffa7de50 (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=c745098e23a6d3e437cbb52ce76669eb066a38fb
commit c745098e23a6d3e437cbb52ce76669eb066a38fb
Merge: ca37b80 968d5a0
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Thu Mar 10 15:48:08 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 10 15:48:08 2011 -0500

    Merge topic 'MakeUseMangledMesaScriptable' into next
    
    968d5a0 Make use_mangled_mesa() available in cmake script mode (#11926)
    1a91ac4 Remove trailing whitespace


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=968d5a0ff17f13867472c857fcbda688d855857c
commit 968d5a0ff17f13867472c857fcbda688d855857c
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Thu Mar 10 21:44:02 2011 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Thu Mar 10 21:44:02 2011 +0100

    Make use_mangled_mesa() available in cmake script mode (#11926)
    
    There is nothing in it which speaks against this.
    
    Alex

diff --git a/Source/cmUseMangledMesaCommand.h b/Source/cmUseMangledMesaCommand.h
index 887200f..fec2265 100644
--- a/Source/cmUseMangledMesaCommand.h
+++ b/Source/cmUseMangledMesaCommand.h
@@ -68,6 +68,11 @@ public:
       "being added to the include directory path earlier.";
     }
 
+  /**
+   * This determines if the command is invoked when in script mode.
+   */
+  virtual bool IsScriptable() { return true; }
+
   /** This command is kept for compatibility with older CMake versions. */
   virtual bool IsDiscouraged()
     {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a91ac4d0dd9bb7eac960a2058fd26f0646b4f50
commit 1a91ac4d0dd9bb7eac960a2058fd26f0646b4f50
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Thu Mar 10 21:43:02 2011 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Thu Mar 10 21:43:02 2011 +0100

    Remove trailing whitespace
    
    Alex

diff --git a/Source/cmUseMangledMesaCommand.h b/Source/cmUseMangledMesaCommand.h
index 141995d..887200f 100644
--- a/Source/cmUseMangledMesaCommand.h
+++ b/Source/cmUseMangledMesaCommand.h
@@ -30,7 +30,7 @@ public:
   /**
    * This is a virtual constructor for the command.
    */
-  virtual cmCommand* Clone() 
+  virtual cmCommand* Clone()
     {
     return new cmUseMangledMesaCommand;
     }
@@ -41,7 +41,7 @@ public:
    */
   virtual bool InitialPass(std::vector<std::string> const& args,
                            cmExecutionStatus &status);
-  
+
   /**
    * The name of the command as specified in CMakeList.txt.
    */
@@ -50,11 +50,11 @@ public:
   /**
    * Succinct documentation.
    */
-  virtual const char* GetTerseDocumentation() 
+  virtual const char* GetTerseDocumentation()
     {
     return "Copy mesa headers for use in combination with system GL.";
     }
-  
+
   /**
    * More documentation.
    */
@@ -80,5 +80,4 @@ protected:
 };
 
 
-
 #endif

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

Summary of changes:
 Source/cmUseMangledMesaCommand.h |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake