summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2011-03-15 18:47:22 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2011-03-15 18:47:22 (GMT)
commitd69220fb4894fe999eb6603a003347567003695f (patch)
treea968cd9726b45ac882ec2e8227fd48aa6105f4c4
parentdd68c0cb16ef2d7f088591accc428ccf2bbc29f3 (diff)
parent968d5a0ff17f13867472c857fcbda688d855857c (diff)
downloadCMake-d69220fb4894fe999eb6603a003347567003695f.zip
CMake-d69220fb4894fe999eb6603a003347567003695f.tar.gz
CMake-d69220fb4894fe999eb6603a003347567003695f.tar.bz2
Merge topic 'MakeUseMangledMesaScriptable'
968d5a0 Make use_mangled_mesa() available in cmake script mode (#11926) 1a91ac4 Remove trailing whitespace
-rw-r--r--Source/cmUseMangledMesaCommand.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/Source/cmUseMangledMesaCommand.h b/Source/cmUseMangledMesaCommand.h
index 141995d..fec2265 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.
*/
@@ -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()
{
@@ -80,5 +85,4 @@ protected:
};
-
#endif