Merge topic 'remove-old-commands-by-policy'
6c91944
Add policy CMP0036 to disallow build_name3969bb2
Add policy CMP0035 to disallow variable_requires178b9af
Add policy CMP0034 to disallow utility_source248d1dc
Add policy CMP0033 to disallow export_library_dependencies6865c8f
Add policy CMP0032 to disallow output_required_filesaa76518
Add policy CMP0031 to disallow load_command97268cf
Add policy CMP0030 to disallow use_mangled_mesa9f64fbf
Add policy CMP0029 to disallow subdir_depends882c0f0
Add infrastructure for policies that disallow commands
This commit is contained in:
commit
8855bf5395
|
@ -1,7 +1,9 @@
|
|||
build_name
|
||||
----------
|
||||
|
||||
Deprecated. Use ${CMAKE_SYSTEM} and ${CMAKE_CXX_COMPILER} instead.
|
||||
Disallowed. See CMake Policy :policy:`CMP0036`.
|
||||
|
||||
Use ${CMAKE_SYSTEM} and ${CMAKE_CXX_COMPILER} instead.
|
||||
|
||||
::
|
||||
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
export_library_dependencies
|
||||
---------------------------
|
||||
|
||||
Deprecated. Use INSTALL(EXPORT) or EXPORT command.
|
||||
Disallowed. See CMake Policy :policy:`CMP0033`.
|
||||
|
||||
Use :command:`install(EXPORT)` or :command:`export` command.
|
||||
|
||||
This command generates an old-style library dependencies file.
|
||||
Projects requiring CMake 2.6 or later should not use the command. Use
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
load_command
|
||||
------------
|
||||
|
||||
Disallowed. See CMake Policy :policy:`CMP0031`.
|
||||
|
||||
Load a command into a running CMake.
|
||||
|
||||
::
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
output_required_files
|
||||
---------------------
|
||||
|
||||
Deprecated. Approximate C preprocessor dependency scanning.
|
||||
Disallowed. See CMake Policy :policy:`CMP0032`.
|
||||
|
||||
Approximate C preprocessor dependency scanning.
|
||||
|
||||
This command exists only because ancient CMake versions provided it.
|
||||
CMake handles preprocessor dependency scanning automatically using a
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
subdir_depends
|
||||
--------------
|
||||
|
||||
Deprecated. Does nothing.
|
||||
Disallowed. See CMake Policy :policy:`CMP0029`.
|
||||
|
||||
Does nothing.
|
||||
|
||||
::
|
||||
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
use_mangled_mesa
|
||||
----------------
|
||||
|
||||
Disallowed. See CMake Policy :policy:`CMP0030`.
|
||||
|
||||
Copy mesa headers for use in combination with system GL.
|
||||
|
||||
::
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
utility_source
|
||||
--------------
|
||||
|
||||
Disallowed. See CMake Policy :policy:`CMP0034`.
|
||||
|
||||
Specify the source tree of a third-party utility.
|
||||
|
||||
::
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
variable_requires
|
||||
-----------------
|
||||
|
||||
Deprecated. Use the if() command instead.
|
||||
Disallowed. See CMake Policy :policy:`CMP0035`.
|
||||
|
||||
Use the if() command instead.
|
||||
|
||||
Assert satisfaction of an option's required variables.
|
||||
|
||||
|
|
|
@ -58,3 +58,11 @@ All Policies
|
|||
/policy/CMP0026
|
||||
/policy/CMP0027
|
||||
/policy/CMP0028
|
||||
/policy/CMP0029
|
||||
/policy/CMP0030
|
||||
/policy/CMP0031
|
||||
/policy/CMP0032
|
||||
/policy/CMP0033
|
||||
/policy/CMP0034
|
||||
/policy/CMP0035
|
||||
/policy/CMP0036
|
||||
|
|
|
@ -0,0 +1,10 @@
|
|||
CMP0029
|
||||
-------
|
||||
|
||||
The :command:`subdir_depends` command should not be called.
|
||||
|
||||
The implementation of this command has been empty since December 2001
|
||||
but was kept in CMake for compatibility for a long time.
|
||||
|
||||
.. |disallowed_version| replace:: 3.0.0
|
||||
.. include:: DISALLOWED_COMMAND.txt
|
|
@ -0,0 +1,11 @@
|
|||
CMP0030
|
||||
-------
|
||||
|
||||
The :command:`use_mangled_mesa` command should not be called.
|
||||
|
||||
This command was created in September 2001 to support VTK before
|
||||
modern CMake language and custom command capabilities. VTK has
|
||||
not used it in years.
|
||||
|
||||
.. |disallowed_version| replace:: 3.0.0
|
||||
.. include:: DISALLOWED_COMMAND.txt
|
|
@ -0,0 +1,13 @@
|
|||
CMP0031
|
||||
-------
|
||||
|
||||
The :command:`load_command` command should not be called.
|
||||
|
||||
This command was added in August 2002 to allow projects to add
|
||||
arbitrary commands implemented in C or C++. However, it does
|
||||
not work when the toolchain in use does not match the ABI of
|
||||
the CMake process. It has been mostly superseded by the
|
||||
:command:`macro` and :command:`function` commands.
|
||||
|
||||
.. |disallowed_version| replace:: 3.0.0
|
||||
.. include:: DISALLOWED_COMMAND.txt
|
|
@ -0,0 +1,13 @@
|
|||
CMP0032
|
||||
-------
|
||||
|
||||
The :command:`output_required_files` command should not be called.
|
||||
|
||||
This command was added in June 2001 to expose the then-current CMake
|
||||
implicit dependency scanner. CMake's real implicit dependency scanner
|
||||
has evolved since then but is not exposed through this command. The
|
||||
scanning capabilities of this command are very limited and this
|
||||
functionality is better achieved through dedicated outside tools.
|
||||
|
||||
.. |disallowed_version| replace:: 3.0.0
|
||||
.. include:: DISALLOWED_COMMAND.txt
|
|
@ -0,0 +1,14 @@
|
|||
CMP0033
|
||||
-------
|
||||
|
||||
The :command:`export_library_dependencies` command should not be called.
|
||||
|
||||
This command was added in January 2003 to export ``<tgt>_LIB_DEPENDS``
|
||||
internal CMake cache entries to a file for installation with a project.
|
||||
This was used at the time to allow transitive link dependencies to
|
||||
work for applications outside of the original build tree of a project.
|
||||
The functionality has been superseded by the :command:`export` and
|
||||
:command:`install(EXPORT)` commands.
|
||||
|
||||
.. |disallowed_version| replace:: 3.0.0
|
||||
.. include:: DISALLOWED_COMMAND.txt
|
|
@ -0,0 +1,11 @@
|
|||
CMP0034
|
||||
-------
|
||||
|
||||
The :command:`utility_source` command should not be called.
|
||||
|
||||
This command was introduced in March 2001 to help build executables used to
|
||||
generate other files. This approach has long been replaced by
|
||||
:command:`add_executable` combined with :command:`add_custom_command`.
|
||||
|
||||
.. |disallowed_version| replace:: 3.0.0
|
||||
.. include:: DISALLOWED_COMMAND.txt
|
|
@ -0,0 +1,10 @@
|
|||
CMP0035
|
||||
-------
|
||||
|
||||
The :command:`variable_requires` command should not be called.
|
||||
|
||||
This command was introduced in November 2001 to perform some conditional
|
||||
logic. It has long been replaced by the :command:`if` command.
|
||||
|
||||
.. |disallowed_version| replace:: 3.0.0
|
||||
.. include:: DISALLOWED_COMMAND.txt
|
|
@ -0,0 +1,12 @@
|
|||
CMP0036
|
||||
-------
|
||||
|
||||
The :command:`build_name` command should not be called.
|
||||
|
||||
This command was added in May 2001 to compute a name for the current
|
||||
operating system and compiler combination. The command has long been
|
||||
documented as discouraged and replaced by the :variable:`CMAKE_SYSTEM`
|
||||
and :variable:`CMAKE_<LANG>_COMPILER` variables.
|
||||
|
||||
.. |disallowed_version| replace:: 3.0.0
|
||||
.. include:: DISALLOWED_COMMAND.txt
|
|
@ -0,0 +1,9 @@
|
|||
CMake >= |disallowed_version| prefer that this command never be called.
|
||||
The OLD behavior for this policy is to allow the command to be called.
|
||||
The NEW behavior for this policy is to issue a FATAL_ERROR when the
|
||||
command is called.
|
||||
|
||||
This policy was introduced in CMake version |disallowed_version|.
|
||||
CMake version |release| warns when the policy is not set and uses
|
||||
OLD behavior. Use the cmake_policy command to set it to OLD or
|
||||
NEW explicitly.
|
|
@ -17,6 +17,9 @@
|
|||
bool cmBuildNameCommand
|
||||
::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
|
||||
{
|
||||
if(this->Disallowed(cmPolicies::CMP0036,
|
||||
"The build_name command should not be called; see CMP0036."))
|
||||
{ return true; }
|
||||
if(args.size() < 1 )
|
||||
{
|
||||
this->SetError("called with incorrect number of arguments");
|
||||
|
|
|
@ -14,46 +14,16 @@
|
|||
|
||||
#include "cmCommand.h"
|
||||
|
||||
/** \class cmBuildNameCommand
|
||||
* \brief build_name command
|
||||
*
|
||||
* cmBuildNameCommand implements the build_name CMake command
|
||||
*/
|
||||
class cmBuildNameCommand : public cmCommand
|
||||
{
|
||||
public:
|
||||
/**
|
||||
* This is a virtual constructor for the command.
|
||||
*/
|
||||
virtual cmCommand* Clone()
|
||||
{
|
||||
return new cmBuildNameCommand;
|
||||
}
|
||||
|
||||
/**
|
||||
* This is called when the command is first encountered in
|
||||
* the CMakeLists.txt file.
|
||||
*/
|
||||
cmTypeMacro(cmBuildNameCommand, cmCommand);
|
||||
virtual cmCommand* Clone() { return new cmBuildNameCommand; }
|
||||
virtual bool InitialPass(std::vector<std::string> const& args,
|
||||
cmExecutionStatus &status);
|
||||
|
||||
/**
|
||||
* This determines if the command is invoked when in script mode.
|
||||
*/
|
||||
virtual bool IsScriptable() const { return true; }
|
||||
|
||||
/**
|
||||
* The name of the command as specified in CMakeList.txt.
|
||||
*/
|
||||
virtual const char* GetName() const {return "build_name";}
|
||||
|
||||
/** This command is kept for compatibility with older CMake versions. */
|
||||
virtual bool IsDiscouraged() const
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
cmTypeMacro(cmBuildNameCommand, cmCommand);
|
||||
virtual bool IsScriptable() const { return true; }
|
||||
virtual bool IsDiscouraged() const { return true; }
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -173,6 +173,25 @@ public:
|
|||
this->Error += e;
|
||||
}
|
||||
|
||||
/** Check if the command is disallowed by a policy. */
|
||||
bool Disallowed(cmPolicies::PolicyID pol, const char* e)
|
||||
{
|
||||
switch(this->Makefile->GetPolicyStatus(pol))
|
||||
{
|
||||
case cmPolicies::WARN:
|
||||
this->Makefile->IssueMessage(cmake::AUTHOR_WARNING,
|
||||
this->Makefile->GetPolicies()->GetPolicyWarning(pol));
|
||||
case cmPolicies::OLD:
|
||||
return false;
|
||||
case cmPolicies::REQUIRED_IF_USED:
|
||||
case cmPolicies::REQUIRED_ALWAYS:
|
||||
case cmPolicies::NEW:
|
||||
this->Makefile->IssueMessage(cmake::FATAL_ERROR, e);
|
||||
break;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
protected:
|
||||
cmMakefile* Makefile;
|
||||
cmCommandArgumentsHelper Helper;
|
||||
|
|
|
@ -21,6 +21,10 @@
|
|||
bool cmExportLibraryDependenciesCommand
|
||||
::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
|
||||
{
|
||||
if(this->Disallowed(cmPolicies::CMP0033,
|
||||
"The export_library_dependencies command should not be called; "
|
||||
"see CMP0033."))
|
||||
{ return true; }
|
||||
if(args.size() < 1 )
|
||||
{
|
||||
this->SetError("called with incorrect number of arguments");
|
||||
|
|
|
@ -14,50 +14,19 @@
|
|||
|
||||
#include "cmCommand.h"
|
||||
|
||||
/** \class cmExportLibraryDependenciesCommand
|
||||
* \brief Add a test to the lists of tests to run.
|
||||
*
|
||||
* cmExportLibraryDependenciesCommand adds a test to the list of tests to run
|
||||
*
|
||||
*/
|
||||
class cmExportLibraryDependenciesCommand : public cmCommand
|
||||
{
|
||||
public:
|
||||
/**
|
||||
* This is a virtual constructor for the command.
|
||||
*/
|
||||
virtual cmCommand* Clone()
|
||||
{
|
||||
return new cmExportLibraryDependenciesCommand;
|
||||
}
|
||||
|
||||
/**
|
||||
* This is called when the command is first encountered in
|
||||
* the CMakeLists.txt file.
|
||||
*/
|
||||
cmTypeMacro(cmExportLibraryDependenciesCommand, cmCommand);
|
||||
virtual cmCommand* Clone() { return new cmExportLibraryDependenciesCommand; }
|
||||
virtual bool InitialPass(std::vector<std::string> const& args,
|
||||
cmExecutionStatus &status);
|
||||
virtual const char* GetName() const { return "export_library_dependencies";}
|
||||
virtual bool IsDiscouraged() const { return true; }
|
||||
|
||||
/**
|
||||
* This is called at the end after all the information
|
||||
* specified by the command is accumulated.
|
||||
*/
|
||||
virtual void FinalPass();
|
||||
virtual bool HasFinalPass() const { return true; }
|
||||
|
||||
/**
|
||||
* The name of the command as specified in CMakeList.txt.
|
||||
*/
|
||||
virtual const char* GetName() const { return "export_library_dependencies";}
|
||||
|
||||
/** This command is kept for compatibility with older CMake versions. */
|
||||
virtual bool IsDiscouraged() const
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
cmTypeMacro(cmExportLibraryDependenciesCommand, cmCommand);
|
||||
|
||||
private:
|
||||
std::string Filename;
|
||||
bool Append;
|
||||
|
|
|
@ -189,6 +189,9 @@ cmLoadedCommand::~cmLoadedCommand()
|
|||
bool cmLoadCommandCommand
|
||||
::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
|
||||
{
|
||||
if(this->Disallowed(cmPolicies::CMP0031,
|
||||
"The load_command command should not be called; see CMP0031."))
|
||||
{ return true; }
|
||||
if(args.size() < 1 )
|
||||
{
|
||||
return true;
|
||||
|
|
|
@ -14,34 +14,14 @@
|
|||
|
||||
#include "cmCommand.h"
|
||||
|
||||
/** \class cmLoadCommandCommand
|
||||
* \brief Load in a Command plugin
|
||||
*
|
||||
* cmLoadCommandCommand loads a command into CMake
|
||||
*/
|
||||
class cmLoadCommandCommand : public cmCommand
|
||||
{
|
||||
public:
|
||||
/**
|
||||
* This is a virtual constructor for the command.
|
||||
*/
|
||||
virtual cmCommand* Clone()
|
||||
{
|
||||
return new cmLoadCommandCommand;
|
||||
}
|
||||
|
||||
/**
|
||||
* This is called when the command is first encountered in
|
||||
* the CMakeLists.txt file.
|
||||
*/
|
||||
virtual cmCommand* Clone() { return new cmLoadCommandCommand; }
|
||||
virtual bool InitialPass(std::vector<std::string> const& args,
|
||||
cmExecutionStatus &status);
|
||||
|
||||
/**
|
||||
* The name of the command as specified in CMakeList.txt.
|
||||
*/
|
||||
virtual const char* GetName() const {return "load_command";}
|
||||
|
||||
virtual bool IsDiscouraged() const { return true; }
|
||||
cmTypeMacro(cmLoadCommandCommand, cmCommand);
|
||||
};
|
||||
|
||||
|
|
|
@ -174,6 +174,9 @@ void cmLBDepend::DependWalk(cmDependInformation* info)
|
|||
bool cmOutputRequiredFilesCommand
|
||||
::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
|
||||
{
|
||||
if(this->Disallowed(cmPolicies::CMP0032,
|
||||
"The output_required_files command should not be called; see CMP0032."))
|
||||
{ return true; }
|
||||
if(args.size() != 2 )
|
||||
{
|
||||
this->SetError("called with incorrect number of arguments");
|
||||
|
|
|
@ -15,45 +15,19 @@
|
|||
#include "cmCommand.h"
|
||||
#include "cmMakeDepend.h"
|
||||
|
||||
/** \class cmOutputRequiredFilesCommand
|
||||
* \brief Output a list of required files for a source file
|
||||
*
|
||||
*/
|
||||
class cmOutputRequiredFilesCommand : public cmCommand
|
||||
{
|
||||
public:
|
||||
/**
|
||||
* This is a virtual constructor for the command.
|
||||
*/
|
||||
virtual cmCommand* Clone()
|
||||
{
|
||||
return new cmOutputRequiredFilesCommand;
|
||||
}
|
||||
|
||||
/**
|
||||
* This is called when the command is first encountered in
|
||||
* the CMakeLists.txt file.
|
||||
*/
|
||||
cmTypeMacro(cmOutputRequiredFilesCommand, cmCommand);
|
||||
virtual cmCommand* Clone() { return new cmOutputRequiredFilesCommand; }
|
||||
virtual bool InitialPass(std::vector<std::string> const& args,
|
||||
cmExecutionStatus &status);
|
||||
|
||||
/**
|
||||
* The name of the command as specified in CMakeList.txt.
|
||||
*/
|
||||
virtual const char* GetName() const { return "output_required_files";}
|
||||
virtual bool IsDiscouraged() const { return true; }
|
||||
|
||||
/** This command is kept for compatibility with older CMake versions. */
|
||||
virtual bool IsDiscouraged() const
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
cmTypeMacro(cmOutputRequiredFilesCommand, cmCommand);
|
||||
void ListDependencies(cmDependInformation const *info,
|
||||
FILE *fout,
|
||||
std::set<cmDependInformation const*> *visited);
|
||||
|
||||
private:
|
||||
std::string File;
|
||||
std::string OutputFile;
|
||||
|
|
|
@ -246,6 +246,46 @@ cmPolicies::cmPolicies()
|
|||
CMP0028, "CMP0028",
|
||||
"Double colon in target name means ALIAS or IMPORTED target.",
|
||||
3,0,0,0, cmPolicies::WARN);
|
||||
|
||||
this->DefinePolicy(
|
||||
CMP0029, "CMP0029",
|
||||
"The subdir_depends command should not be called.",
|
||||
3,0,0,0, cmPolicies::WARN);
|
||||
|
||||
this->DefinePolicy(
|
||||
CMP0030, "CMP0030",
|
||||
"The use_mangled_mesa command should not be called.",
|
||||
3,0,0,0, cmPolicies::WARN);
|
||||
|
||||
this->DefinePolicy(
|
||||
CMP0031, "CMP0031",
|
||||
"The load_command command should not be called.",
|
||||
3,0,0,0, cmPolicies::WARN);
|
||||
|
||||
this->DefinePolicy(
|
||||
CMP0032, "CMP0032",
|
||||
"The output_required_files command should not be called.",
|
||||
3,0,0,0, cmPolicies::WARN);
|
||||
|
||||
this->DefinePolicy(
|
||||
CMP0033, "CMP0033",
|
||||
"The export_library_dependencies command should not be called.",
|
||||
3,0,0,0, cmPolicies::WARN);
|
||||
|
||||
this->DefinePolicy(
|
||||
CMP0034, "CMP0034",
|
||||
"The utility_source command should not be called.",
|
||||
3,0,0,0, cmPolicies::WARN);
|
||||
|
||||
this->DefinePolicy(
|
||||
CMP0035, "CMP0035",
|
||||
"The variable_requires command should not be called.",
|
||||
3,0,0,0, cmPolicies::WARN);
|
||||
|
||||
this->DefinePolicy(
|
||||
CMP0036, "CMP0036",
|
||||
"The build_name command should not be called.",
|
||||
3,0,0,0, cmPolicies::WARN);
|
||||
}
|
||||
|
||||
cmPolicies::~cmPolicies()
|
||||
|
|
|
@ -80,6 +80,14 @@ public:
|
|||
CMP0027, ///< Conditionally linked imported targets with missing include
|
||||
/// directories.
|
||||
CMP0028, ///< Double colon in target name means ALIAS or IMPORTED target.
|
||||
CMP0029, ///< Disallow command: subdir_depends
|
||||
CMP0030, ///< Disallow command: use_mangled_mesa
|
||||
CMP0031, ///< Disallow command: load_command
|
||||
CMP0032, ///< Disallow command: output_required_files
|
||||
CMP0033, ///< Disallow command: export_library_dependencies
|
||||
CMP0034, ///< Disallow command: utility_source
|
||||
CMP0035, ///< Disallow command: variable_requires
|
||||
CMP0036, ///< Disallow command: build_name
|
||||
|
||||
/** \brief Always the last entry.
|
||||
*
|
||||
|
|
|
@ -11,10 +11,10 @@
|
|||
============================================================================*/
|
||||
#include "cmSubdirDependsCommand.h"
|
||||
|
||||
// cmSubdirDependsCommand
|
||||
bool cmSubdirDependsCommand::InitialPass(std::vector<std::string> const& ,
|
||||
cmExecutionStatus &)
|
||||
{
|
||||
this->Disallowed(cmPolicies::CMP0029,
|
||||
"The subdir_depends command should not be called; see CMP0029.");
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -14,45 +14,15 @@
|
|||
|
||||
#include "cmCommand.h"
|
||||
|
||||
/** \class cmSubdirDependsCommand
|
||||
* \brief Legacy command. Do not use.
|
||||
*
|
||||
* cmSubdirDependsCommand has been left in CMake for compatability with
|
||||
* projects already using it. Its functionality in supporting parallel
|
||||
* builds is now automatic. The command does not do anything.
|
||||
*/
|
||||
class cmSubdirDependsCommand : public cmCommand
|
||||
{
|
||||
public:
|
||||
/**
|
||||
* This is a virtual constructor for the command.
|
||||
*/
|
||||
virtual cmCommand* Clone()
|
||||
{
|
||||
return new cmSubdirDependsCommand;
|
||||
}
|
||||
|
||||
/**
|
||||
* This is called when the command is first encountered in
|
||||
* the CMakeLists.txt file.
|
||||
*/
|
||||
virtual cmCommand* Clone() { return new cmSubdirDependsCommand; }
|
||||
virtual bool InitialPass(std::vector<std::string> const& args,
|
||||
cmExecutionStatus &status);
|
||||
|
||||
/**
|
||||
* The name of the command as specified in CMakeList.txt.
|
||||
*/
|
||||
virtual const char* GetName() const { return "subdir_depends";}
|
||||
|
||||
/** This command is kept for compatibility with older CMake versions. */
|
||||
virtual bool IsDiscouraged() const
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
virtual bool IsDiscouraged() const { return true; }
|
||||
cmTypeMacro(cmSubdirDependsCommand, cmCommand);
|
||||
};
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
|
|
|
@ -14,10 +14,12 @@
|
|||
|
||||
#include <cmsys/RegularExpression.hxx>
|
||||
|
||||
// cmUseMangledMesaCommand
|
||||
bool cmUseMangledMesaCommand
|
||||
::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
|
||||
{
|
||||
if(this->Disallowed(cmPolicies::CMP0030,
|
||||
"The use_mangled_mesa command should not be called; see CMP0030."))
|
||||
{ return true; }
|
||||
// expected two arguments:
|
||||
// arguement one: the full path to gl_mangle.h
|
||||
// arguement two : directory for output of edited headers
|
||||
|
|
|
@ -14,54 +14,19 @@
|
|||
|
||||
#include "cmCommand.h"
|
||||
|
||||
#include "cmSourceFile.h"
|
||||
|
||||
/** \class cmUseMangledMesaCommand
|
||||
* \brief Create Tcl Wrappers for VTK classes.
|
||||
*
|
||||
* cmUseMangledMesaCommand is used to define a CMake variable include
|
||||
* path location by specifying a file and list of directories.
|
||||
*/
|
||||
class cmUseMangledMesaCommand : public cmCommand
|
||||
{
|
||||
public:
|
||||
cmTypeMacro(cmUseMangledMesaCommand, cmCommand);
|
||||
|
||||
/**
|
||||
* This is a virtual constructor for the command.
|
||||
*/
|
||||
virtual cmCommand* Clone()
|
||||
{
|
||||
return new cmUseMangledMesaCommand;
|
||||
}
|
||||
|
||||
/**
|
||||
* This is called when the command is first encountered in
|
||||
* the CMakeLists.txt file.
|
||||
*/
|
||||
virtual cmCommand* Clone() { return new cmUseMangledMesaCommand; }
|
||||
virtual bool InitialPass(std::vector<std::string> const& args,
|
||||
cmExecutionStatus &status);
|
||||
|
||||
/**
|
||||
* The name of the command as specified in CMakeList.txt.
|
||||
*/
|
||||
virtual const char* GetName() const { return "use_mangled_mesa";}
|
||||
|
||||
/**
|
||||
* This determines if the command is invoked when in script mode.
|
||||
*/
|
||||
virtual bool IsScriptable() const { return true; }
|
||||
|
||||
/** This command is kept for compatibility with older CMake versions. */
|
||||
virtual bool IsDiscouraged() const
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
virtual bool IsDiscouraged() const { return true; }
|
||||
protected:
|
||||
void CopyAndFullPathMesaHeader(const char* source,
|
||||
const char* outdir);
|
||||
};
|
||||
|
||||
|
||||
#endif
|
||||
|
|
|
@ -15,6 +15,9 @@
|
|||
bool cmUtilitySourceCommand
|
||||
::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
|
||||
{
|
||||
if(this->Disallowed(cmPolicies::CMP0034,
|
||||
"The utility_source command should not be called; see CMP0034."))
|
||||
{ return true; }
|
||||
if(args.size() < 3)
|
||||
{
|
||||
this->SetError("called with incorrect number of arguments");
|
||||
|
|
|
@ -14,48 +14,15 @@
|
|||
|
||||
#include "cmCommand.h"
|
||||
|
||||
/** \class cmUtilitySourceCommand
|
||||
* \brief A command to setup a cache entry with the location of a third-party
|
||||
* utility's source.
|
||||
*
|
||||
* cmUtilitySourceCommand is used when a third-party utility's source is
|
||||
* included in the project's source tree. It specifies the location of
|
||||
* the executable's source, and any files that may be needed to confirm the
|
||||
* identity of the source.
|
||||
*/
|
||||
class cmUtilitySourceCommand : public cmCommand
|
||||
{
|
||||
public:
|
||||
/**
|
||||
* This is a virtual constructor for the command.
|
||||
*/
|
||||
virtual cmCommand* Clone()
|
||||
{
|
||||
return new cmUtilitySourceCommand;
|
||||
}
|
||||
|
||||
/**
|
||||
* This is called when the command is first encountered in
|
||||
* the CMakeLists.txt file.
|
||||
*/
|
||||
cmTypeMacro(cmUtilitySourceCommand, cmCommand);
|
||||
virtual cmCommand* Clone() { return new cmUtilitySourceCommand; }
|
||||
virtual bool InitialPass(std::vector<std::string> const& args,
|
||||
cmExecutionStatus &status);
|
||||
|
||||
/**
|
||||
* The name of the command as specified in CMakeList.txt.
|
||||
*/
|
||||
virtual const char* GetName() const { return "utility_source";}
|
||||
|
||||
/** This command is kept for compatibility with older CMake versions. */
|
||||
virtual bool IsDiscouraged() const
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
cmTypeMacro(cmUtilitySourceCommand, cmCommand);
|
||||
virtual bool IsDiscouraged() const { return true; }
|
||||
};
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
|
|
|
@ -16,6 +16,9 @@
|
|||
bool cmVariableRequiresCommand
|
||||
::InitialPass(std::vector<std::string>const& args, cmExecutionStatus &)
|
||||
{
|
||||
if(this->Disallowed(cmPolicies::CMP0035,
|
||||
"The variable_requires command should not be called; see CMP0035."))
|
||||
{ return true; }
|
||||
if(args.size() < 3 )
|
||||
{
|
||||
this->SetError("called with incorrect number of arguments");
|
||||
|
|
|
@ -14,40 +14,15 @@
|
|||
|
||||
#include "cmCommand.h"
|
||||
|
||||
/** \class cmVariableRequiresCommand
|
||||
* \brief Displays a message to the user
|
||||
*
|
||||
*/
|
||||
class cmVariableRequiresCommand : public cmCommand
|
||||
{
|
||||
public:
|
||||
/**
|
||||
* This is a virtual constructor for the command.
|
||||
*/
|
||||
virtual cmCommand* Clone()
|
||||
{
|
||||
return new cmVariableRequiresCommand;
|
||||
}
|
||||
|
||||
/**
|
||||
* This is called when the command is first encountered in
|
||||
* the CMakeLists.txt file.
|
||||
*/
|
||||
cmTypeMacro(cmVariableRequiresCommand, cmCommand);
|
||||
virtual cmCommand* Clone() { return new cmVariableRequiresCommand; }
|
||||
virtual bool InitialPass(std::vector<std::string> const& args,
|
||||
cmExecutionStatus &status);
|
||||
|
||||
/**
|
||||
* The name of the command as specified in CMakeList.txt.
|
||||
*/
|
||||
virtual const char* GetName() const { return "variable_requires";}
|
||||
|
||||
/** This command is kept for compatibility with older CMake versions. */
|
||||
virtual bool IsDiscouraged() const
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
cmTypeMacro(cmVariableRequiresCommand, cmCommand);
|
||||
virtual bool IsDiscouraged() const { return true; }
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -61,6 +61,7 @@ if(UNIX AND "${CMAKE_TEST_GENERATOR}" MATCHES "Unix Makefiles")
|
|||
add_RunCMake_test(CompilerChange)
|
||||
endif()
|
||||
add_RunCMake_test(Configure)
|
||||
add_RunCMake_test(DisallowedCommands)
|
||||
add_RunCMake_test(ExternalData)
|
||||
add_RunCMake_test(FPHSA)
|
||||
add_RunCMake_test(GeneratorExpression)
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
1
|
|
@ -0,0 +1,4 @@
|
|||
CMake Error at CMP0029-NEW.cmake:2 \(subdir_depends\):
|
||||
The subdir_depends command should not be called; see CMP0029.
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)
|
|
@ -0,0 +1,2 @@
|
|||
cmake_policy(SET CMP0029 NEW)
|
||||
subdir_depends()
|
|
@ -0,0 +1 @@
|
|||
^$
|
|
@ -0,0 +1,2 @@
|
|||
cmake_policy(SET CMP0029 OLD)
|
||||
subdir_depends()
|
|
@ -0,0 +1,7 @@
|
|||
CMake Warning \(dev\) at CMP0029-WARN.cmake:1 \(subdir_depends\):
|
||||
Policy CMP0029 is not set: The subdir_depends command should not be called.
|
||||
Run "cmake --help-policy CMP0029" for policy details. Use the cmake_policy
|
||||
command to set the policy and suppress this warning.
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)
|
||||
This warning is for project developers. Use -Wno-dev to suppress it.
|
|
@ -0,0 +1 @@
|
|||
subdir_depends()
|
|
@ -0,0 +1 @@
|
|||
1
|
|
@ -0,0 +1,4 @@
|
|||
CMake Error at CMP0030-NEW.cmake:2 \(use_mangled_mesa\):
|
||||
The use_mangled_mesa command should not be called; see CMP0030.
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)
|
|
@ -0,0 +1,2 @@
|
|||
cmake_policy(SET CMP0030 NEW)
|
||||
use_mangled_mesa()
|
|
@ -0,0 +1 @@
|
|||
1
|
|
@ -0,0 +1,4 @@
|
|||
^CMake Error at CMP0030-OLD.cmake:2 \(use_mangled_mesa\):
|
||||
use_mangled_mesa called with incorrect number of arguments
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)$
|
|
@ -0,0 +1,2 @@
|
|||
cmake_policy(SET CMP0030 OLD)
|
||||
use_mangled_mesa()
|
|
@ -0,0 +1 @@
|
|||
1
|
|
@ -0,0 +1,12 @@
|
|||
CMake Warning \(dev\) at CMP0030-WARN.cmake:1 \(use_mangled_mesa\):
|
||||
Policy CMP0030 is not set: The use_mangled_mesa command should not be
|
||||
called. Run "cmake --help-policy CMP0030" for policy details. Use the
|
||||
cmake_policy command to set the policy and suppress this warning.
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)
|
||||
This warning is for project developers. Use -Wno-dev to suppress it.
|
||||
|
||||
CMake Error at CMP0030-WARN.cmake:1 \(use_mangled_mesa\):
|
||||
use_mangled_mesa called with incorrect number of arguments
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)
|
|
@ -0,0 +1 @@
|
|||
use_mangled_mesa()
|
|
@ -0,0 +1 @@
|
|||
1
|
|
@ -0,0 +1,4 @@
|
|||
CMake Error at CMP0031-NEW.cmake:2 \(load_command\):
|
||||
The load_command command should not be called; see CMP0031.
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)
|
|
@ -0,0 +1,2 @@
|
|||
cmake_policy(SET CMP0031 NEW)
|
||||
load_command()
|
|
@ -0,0 +1 @@
|
|||
1
|
|
@ -0,0 +1,4 @@
|
|||
CMake Error at CMP0031-OLD.cmake:2 \(load_command\):
|
||||
load_command Attempt to load command failed from file.*bogus_command.*
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)
|
|
@ -0,0 +1,2 @@
|
|||
cmake_policy(SET CMP0031 OLD)
|
||||
load_command(bogus_command)
|
|
@ -0,0 +1 @@
|
|||
1
|
|
@ -0,0 +1,12 @@
|
|||
CMake Warning \(dev\) at CMP0031-WARN.cmake:1 \(load_command\):
|
||||
Policy CMP0031 is not set: The load_command command should not be called.
|
||||
Run "cmake --help-policy CMP0031" for policy details. Use the cmake_policy
|
||||
command to set the policy and suppress this warning.
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)
|
||||
This warning is for project developers. Use -Wno-dev to suppress it.
|
||||
|
||||
CMake Error at CMP0031-WARN.cmake:1 \(load_command\):
|
||||
load_command Attempt to load command failed from file.*bogus_command.*
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)
|
|
@ -0,0 +1 @@
|
|||
load_command(bogus_command)
|
|
@ -0,0 +1 @@
|
|||
1
|
|
@ -0,0 +1,4 @@
|
|||
CMake Error at CMP0032-NEW.cmake:2 \(output_required_files\):
|
||||
The output_required_files command should not be called; see CMP0032.
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)
|
|
@ -0,0 +1,2 @@
|
|||
cmake_policy(SET CMP0032 NEW)
|
||||
output_required_files()
|
|
@ -0,0 +1 @@
|
|||
1
|
|
@ -0,0 +1,4 @@
|
|||
CMake Error at CMP0032-OLD.cmake:2 \(output_required_files\):
|
||||
output_required_files called with incorrect number of arguments
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)
|
|
@ -0,0 +1,2 @@
|
|||
cmake_policy(SET CMP0032 OLD)
|
||||
output_required_files()
|
|
@ -0,0 +1 @@
|
|||
1
|
|
@ -0,0 +1,12 @@
|
|||
CMake Warning \(dev\) at CMP0032-WARN.cmake:1 \(output_required_files\):
|
||||
Policy CMP0032 is not set: The output_required_files command should not be
|
||||
called. Run "cmake --help-policy CMP0032" for policy details. Use the
|
||||
cmake_policy command to set the policy and suppress this warning.
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)
|
||||
This warning is for project developers. Use -Wno-dev to suppress it.
|
||||
|
||||
CMake Error at CMP0032-WARN.cmake:1 \(output_required_files\):
|
||||
output_required_files called with incorrect number of arguments
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)
|
|
@ -0,0 +1 @@
|
|||
output_required_files()
|
|
@ -0,0 +1 @@
|
|||
1
|
|
@ -0,0 +1,4 @@
|
|||
CMake Error at CMP0033-NEW.cmake:2 \(export_library_dependencies\):
|
||||
The export_library_dependencies command should not be called; see CMP0033.
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)
|
|
@ -0,0 +1,2 @@
|
|||
cmake_policy(SET CMP0033 NEW)
|
||||
export_library_dependencies()
|
|
@ -0,0 +1 @@
|
|||
1
|
|
@ -0,0 +1,4 @@
|
|||
CMake Error at CMP0033-OLD.cmake:2 \(export_library_dependencies\):
|
||||
export_library_dependencies called with incorrect number of arguments
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)
|
|
@ -0,0 +1,2 @@
|
|||
cmake_policy(SET CMP0033 OLD)
|
||||
export_library_dependencies()
|
|
@ -0,0 +1 @@
|
|||
1
|
|
@ -0,0 +1,12 @@
|
|||
CMake Warning \(dev\) at CMP0033-WARN.cmake:1 \(export_library_dependencies\):
|
||||
Policy CMP0033 is not set: The export_library_dependencies command should
|
||||
not be called. Run "cmake --help-policy CMP0033" for policy details. Use
|
||||
the cmake_policy command to set the policy and suppress this warning.
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)
|
||||
This warning is for project developers. Use -Wno-dev to suppress it.
|
||||
|
||||
CMake Error at CMP0033-WARN.cmake:1 \(export_library_dependencies\):
|
||||
export_library_dependencies called with incorrect number of arguments
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)
|
|
@ -0,0 +1 @@
|
|||
export_library_dependencies()
|
|
@ -0,0 +1 @@
|
|||
1
|
|
@ -0,0 +1,4 @@
|
|||
CMake Error at CMP0034-NEW.cmake:2 \(utility_source\):
|
||||
The utility_source command should not be called; see CMP0034.
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)
|
|
@ -0,0 +1,2 @@
|
|||
cmake_policy(SET CMP0034 NEW)
|
||||
utility_source()
|
|
@ -0,0 +1 @@
|
|||
1
|
|
@ -0,0 +1,4 @@
|
|||
CMake Error at CMP0034-OLD.cmake:2 \(utility_source\):
|
||||
utility_source called with incorrect number of arguments
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)
|
|
@ -0,0 +1,2 @@
|
|||
cmake_policy(SET CMP0034 OLD)
|
||||
utility_source()
|
|
@ -0,0 +1 @@
|
|||
1
|
|
@ -0,0 +1,12 @@
|
|||
CMake Warning \(dev\) at CMP0034-WARN.cmake:1 \(utility_source\):
|
||||
Policy CMP0034 is not set: The utility_source command should not be called.
|
||||
Run "cmake --help-policy CMP0034" for policy details. Use the cmake_policy
|
||||
command to set the policy and suppress this warning.
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)
|
||||
This warning is for project developers. Use -Wno-dev to suppress it.
|
||||
|
||||
CMake Error at CMP0034-WARN.cmake:1 \(utility_source\):
|
||||
utility_source called with incorrect number of arguments
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)
|
|
@ -0,0 +1 @@
|
|||
utility_source()
|
|
@ -0,0 +1 @@
|
|||
1
|
|
@ -0,0 +1,4 @@
|
|||
CMake Error at CMP0035-NEW.cmake:2 \(variable_requires\):
|
||||
The variable_requires command should not be called; see CMP0035.
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)
|
|
@ -0,0 +1,2 @@
|
|||
cmake_policy(SET CMP0035 NEW)
|
||||
variable_requires()
|
|
@ -0,0 +1 @@
|
|||
1
|
|
@ -0,0 +1,4 @@
|
|||
CMake Error at CMP0035-OLD.cmake:2 \(variable_requires\):
|
||||
variable_requires called with incorrect number of arguments
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)
|
|
@ -0,0 +1,2 @@
|
|||
cmake_policy(SET CMP0035 OLD)
|
||||
variable_requires()
|
|
@ -0,0 +1 @@
|
|||
1
|
|
@ -0,0 +1,12 @@
|
|||
CMake Warning \(dev\) at CMP0035-WARN.cmake:1 \(variable_requires\):
|
||||
Policy CMP0035 is not set: The variable_requires command should not be
|
||||
called. Run "cmake --help-policy CMP0035" for policy details. Use the
|
||||
cmake_policy command to set the policy and suppress this warning.
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)
|
||||
This warning is for project developers. Use -Wno-dev to suppress it.
|
||||
|
||||
CMake Error at CMP0035-WARN.cmake:1 \(variable_requires\):
|
||||
variable_requires called with incorrect number of arguments
|
||||
Call Stack \(most recent call first\):
|
||||
CMakeLists.txt:3 \(include\)
|
|
@ -0,0 +1 @@
|
|||
variable_requires()
|
|
@ -0,0 +1 @@
|
|||
1
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue