Merge topic 'MakeUseMangledMesaScriptable'
968d5a0
Make use_mangled_mesa() available in cmake script mode (#11926)1a91ac4
Remove trailing whitespace
This commit is contained in:
commit
d69220fb48
|
@ -30,7 +30,7 @@ public:
|
||||||
/**
|
/**
|
||||||
* This is a virtual constructor for the command.
|
* This is a virtual constructor for the command.
|
||||||
*/
|
*/
|
||||||
virtual cmCommand* Clone()
|
virtual cmCommand* Clone()
|
||||||
{
|
{
|
||||||
return new cmUseMangledMesaCommand;
|
return new cmUseMangledMesaCommand;
|
||||||
}
|
}
|
||||||
|
@ -41,7 +41,7 @@ public:
|
||||||
*/
|
*/
|
||||||
virtual bool InitialPass(std::vector<std::string> const& args,
|
virtual bool InitialPass(std::vector<std::string> const& args,
|
||||||
cmExecutionStatus &status);
|
cmExecutionStatus &status);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The name of the command as specified in CMakeList.txt.
|
* The name of the command as specified in CMakeList.txt.
|
||||||
*/
|
*/
|
||||||
|
@ -50,11 +50,11 @@ public:
|
||||||
/**
|
/**
|
||||||
* Succinct documentation.
|
* Succinct documentation.
|
||||||
*/
|
*/
|
||||||
virtual const char* GetTerseDocumentation()
|
virtual const char* GetTerseDocumentation()
|
||||||
{
|
{
|
||||||
return "Copy mesa headers for use in combination with system GL.";
|
return "Copy mesa headers for use in combination with system GL.";
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* More documentation.
|
* More documentation.
|
||||||
*/
|
*/
|
||||||
|
@ -68,6 +68,11 @@ public:
|
||||||
"being added to the include directory path earlier.";
|
"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. */
|
/** This command is kept for compatibility with older CMake versions. */
|
||||||
virtual bool IsDiscouraged()
|
virtual bool IsDiscouraged()
|
||||||
{
|
{
|
||||||
|
@ -80,5 +85,4 @@ protected:
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue