Add policy CMP0033 to disallow export_library_dependencies

This commit is contained in:
Brad King 2013-10-18 13:09:32 -04:00
parent 6865c8fe05
commit 248d1dc057
17 changed files with 61 additions and 36 deletions

View File

@ -1,7 +1,9 @@
export_library_dependencies 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. This command generates an old-style library dependencies file.
Projects requiring CMake 2.6 or later should not use the command. Use Projects requiring CMake 2.6 or later should not use the command. Use

View File

@ -62,3 +62,4 @@ All Policies
/policy/CMP0030 /policy/CMP0030
/policy/CMP0031 /policy/CMP0031
/policy/CMP0032 /policy/CMP0032
/policy/CMP0033

14
Help/policy/CMP0033.rst Normal file
View File

@ -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

View File

@ -21,6 +21,10 @@
bool cmExportLibraryDependenciesCommand bool cmExportLibraryDependenciesCommand
::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) ::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 ) if(args.size() < 1 )
{ {
this->SetError("called with incorrect number of arguments"); this->SetError("called with incorrect number of arguments");

View File

@ -14,50 +14,19 @@
#include "cmCommand.h" #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 class cmExportLibraryDependenciesCommand : public cmCommand
{ {
public: public:
/** cmTypeMacro(cmExportLibraryDependenciesCommand, cmCommand);
* This is a virtual constructor for the command. virtual cmCommand* Clone() { return new cmExportLibraryDependenciesCommand; }
*/
virtual cmCommand* Clone()
{
return new cmExportLibraryDependenciesCommand;
}
/**
* This is called when the command is first encountered in
* the CMakeLists.txt file.
*/
virtual bool InitialPass(std::vector<std::string> const& args, virtual bool InitialPass(std::vector<std::string> const& args,
cmExecutionStatus &status); 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 void FinalPass();
virtual bool HasFinalPass() const { return true; } 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: private:
std::string Filename; std::string Filename;
bool Append; bool Append;

View File

@ -266,6 +266,11 @@ cmPolicies::cmPolicies()
CMP0032, "CMP0032", CMP0032, "CMP0032",
"The output_required_files command should not be called.", "The output_required_files command should not be called.",
3,0,0,0, cmPolicies::WARN); 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);
} }
cmPolicies::~cmPolicies() cmPolicies::~cmPolicies()

View File

@ -84,6 +84,7 @@ public:
CMP0030, ///< Disallow command: use_mangled_mesa CMP0030, ///< Disallow command: use_mangled_mesa
CMP0031, ///< Disallow command: load_command CMP0031, ///< Disallow command: load_command
CMP0032, ///< Disallow command: output_required_files CMP0032, ///< Disallow command: output_required_files
CMP0033, ///< Disallow command: export_library_dependencies
/** \brief Always the last entry. /** \brief Always the last entry.
* *

View File

@ -0,0 +1 @@
1

View File

@ -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\)

View File

@ -0,0 +1,2 @@
cmake_policy(SET CMP0033 NEW)
export_library_dependencies()

View File

@ -0,0 +1 @@
1

View File

@ -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\)

View File

@ -0,0 +1,2 @@
cmake_policy(SET CMP0033 OLD)
export_library_dependencies()

View File

@ -0,0 +1 @@
1

View File

@ -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\)

View File

@ -0,0 +1 @@
export_library_dependencies()

View File

@ -5,6 +5,7 @@ foreach(p
CMP0030 CMP0030
CMP0031 CMP0031
CMP0032 CMP0032
CMP0033
) )
run_cmake(${p}-WARN) run_cmake(${p}-WARN)
run_cmake(${p}-OLD) run_cmake(${p}-OLD)