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 e723550b1a75d8a9e7b4615bbf70222237eb2ba1 (commit)
via 2c738c945175b554db1e79672bff076620185063 (commit)
from 451505b3bb8a400552c99d31e9f0c26f15fa3059 (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=e723550b1a75d8a9e7b4615bbf70222237eb2ba1
commit e723550b1a75d8a9e7b4615bbf70222237eb2ba1
Merge: 451505b 2c738c9
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Sep 21 09:44:57 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Sep 21 09:44:57 2015 -0400
Merge topic 'revert-conflicting-unfinished-topics' into next
2c738c94 Revert topics 'lib_depends-in-property' and
'restrict-shlib-link-flags-to-enable-exports'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c738c945175b554db1e79672bff076620185063
commit 2c738c945175b554db1e79672bff076620185063
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Sep 21 09:43:57 2015 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Sep 21 09:43:57 2015 -0400
Revert topics 'lib_depends-in-property' and
'restrict-shlib-link-flags-to-enable-exports'
They conflict and each need to be rebased and revised.
diff --git a/Help/command/try_compile.rst b/Help/command/try_compile.rst
index 28dae80..1ed24df 100644
--- a/Help/command/try_compile.rst
+++ b/Help/command/try_compile.rst
@@ -100,7 +100,6 @@ If set, the following variables are passed in to the
generated
try_compile CMakeLists.txt to initialize compile target properties with
default values:
-* :variable:`CMAKE_ENABLE_EXPORTS`
* :variable:`CMAKE_LINK_SEARCH_START_STATIC`
* :variable:`CMAKE_LINK_SEARCH_END_STATIC`
* :variable:`CMAKE_POSITION_INDEPENDENT_CODE`
@@ -108,7 +107,5 @@ default values:
If :policy:`CMP0056` is set to ``NEW``, then
:variable:`CMAKE_EXE_LINKER_FLAGS` is passed in as well.
-The current setting of :policy:`CMP0065` is set in the generated project.
-
Set the :variable:`CMAKE_TRY_COMPILE_CONFIGURATION` variable to choose
a build configuration.
diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst
index 38047ef..590f10d 100644
--- a/Help/manual/cmake-policies.7.rst
+++ b/Help/manual/cmake-policies.7.rst
@@ -122,5 +122,3 @@ All Policies
/policy/CMP0062
/policy/CMP0063
/policy/CMP0064
- /policy/CMP0065
- /policy/CMP0066
diff --git a/Help/manual/cmake-variables.7.rst
b/Help/manual/cmake-variables.7.rst
index 1fa117f..e0dbdeb 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -245,7 +245,6 @@ Variables that Control the Build
/variable/CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_CONFIG
/variable/CMAKE_CONFIG_POSTFIX
/variable/CMAKE_DEBUG_POSTFIX
- /variable/CMAKE_ENABLE_EXPORTS
/variable/CMAKE_EXE_LINKER_FLAGS_CONFIG
/variable/CMAKE_EXE_LINKER_FLAGS
/variable/CMAKE_Fortran_FORMAT
diff --git a/Help/policy/CMP0065.rst b/Help/policy/CMP0065.rst
deleted file mode 100644
index fbdb4a9..0000000
--- a/Help/policy/CMP0065.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-CMP0065
--------
-
-Restrict the addition of CMAKE_SHARED_LIBRARY_LINK_<LANG>_FLAGS
-to executable targets only when the :prop_tgt:`ENABLE_EXPORTS`
-target property is turned on.
-
-The ``OLD`` behavior of this policy is to always use the additional link
-flags when linking executables regardless of the value of the
-:prop_tgt:`ENABLE_EXPORTS` target property.
-
-The ``NEW`` behavior of this policy is to only use the additional link
-flags when linking executables if the :prop_tgt:`ENABLE_EXPORTS` target
-property is set to ``True``.
diff --git a/Help/policy/CMP0066.rst b/Help/policy/CMP0066.rst
deleted file mode 100644
index afe21ee..0000000
--- a/Help/policy/CMP0066.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-CMP0066
--------
-
-Deprecate the ``_LIB_DEPENDS`` variables.
-
-Instead, the values are stored as global properties.
-
-The ``OLD`` behavior for this policy is to set ``_LIB_DEPENDS`` variables. The
-``NEW`` behavior is to only store them as properties.
-
-This policy was introduced in CMake version 3.4. CMake version
-|release| warns when the policy is not set and uses ``OLD`` behavior. Use
-the :command:`cmake_policy()` command to set it to ``OLD`` or ``NEW``
-explicitly.
-
-.. include:: DEPRECATED.txt
diff --git a/Help/prop_tgt/ENABLE_EXPORTS.rst b/Help/prop_tgt/ENABLE_EXPORTS.rst
index dfd4af7..283f5a8 100644
--- a/Help/prop_tgt/ENABLE_EXPORTS.rst
+++ b/Help/prop_tgt/ENABLE_EXPORTS.rst
@@ -7,7 +7,7 @@ Normally an executable does not export any symbols because it
is the
final program. It is possible for an executable to export symbols to
be used by loadable modules. When this property is set to true CMake
will allow other targets to "link" to the executable with the
-:command:`TARGET_LINK_LIBRARIES` command. On all platforms a target-level
+TARGET_LINK_LIBRARIES command. On all platforms a target-level
dependency on the executable is created for targets that link to it.
For DLL platforms an import library will be created for the exported
symbols and then used for linking. All Windows-based systems
@@ -17,6 +17,3 @@ module will "link" to the executable using a flag like
"-bundle_loader". For other non-DLL platforms the link rule is simply
ignored since the dynamic loader will automatically bind symbols when
the module is loaded.
-
-This property is initialized by the value of the variable
-:variable:`CMAKE_ENABLE_EXPORTS` if it is set when a target is created.
diff --git a/Help/release/dev/lib_depends-in-property.rst
b/Help/release/dev/lib_depends-in-property.rst
deleted file mode 100644
index 39cc616..0000000
--- a/Help/release/dev/lib_depends-in-property.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-lib_depends-in-property
------------------------
-
-* Adds policy CMP0066 which deprecates the ``_LIB_DEPENDS`` variables for
- storing dependency information of targets. Instead, a global propery is
- used to store the information so that it does not persist between CMake
- runs (as it is always regenerated as-needed anyways).
diff --git a/Help/variable/CMAKE_ENABLE_EXPORTS.rst
b/Help/variable/CMAKE_ENABLE_EXPORTS.rst
deleted file mode 100644
index 1f9ba6f..0000000
--- a/Help/variable/CMAKE_ENABLE_EXPORTS.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-CMAKE_ENABLE_EXPORTS
---------------------
-
-Specify whether an executable exports symbols for loadable modules.
-
-Normally an executable does not export any symbols because it is the
-final program. It is possible for an executable to export symbols to
-be used by loadable modules. When this property is set to true CMake
-will allow other targets to "link" to the executable with the
-:command:`TARGET_LINK_LIBRARIES` command. On all platforms a target-level
-dependency on the executable is created for targets that link to it.
-For DLL platforms an import library will be created for the exported
-symbols and then used for linking. All Windows-based systems
-including Cygwin are DLL platforms. For non-DLL platforms that
-require all symbols to be resolved at link time, such as Mac OS X, the
-module will "link" to the executable using a flag like
-"-bundle_loader". For other non-DLL platforms the link rule is simply
-ignored since the dynamic loader will automatically bind symbols when
-the module is loaded.
-
-This variable is used to initialize the target property
-:prop_tgt:`ENABLE_EXPORTS` for executable targets.
diff --git a/Modules/KDE3Macros.cmake b/Modules/KDE3Macros.cmake
index 11d4256..07864f5 100644
--- a/Modules/KDE3Macros.cmake
+++ b/Modules/KDE3Macros.cmake
@@ -330,6 +330,7 @@ macro(KDE3_INSTALL_LIBTOOL_FILE _target)
file(APPEND ${_laname} "old_library=''\n")
file(APPEND ${_laname} "# Libraries that this one depends upon.\n")
file(APPEND ${_laname} "dependency_libs=''\n")
+# file(APPEND ${_laname} "dependency_libs='${${_target}_LIB_DEPENDS}'\n")
file(APPEND ${_laname} "# Version
information.\ncurrent=0\nage=0\nrevision=0\n")
file(APPEND ${_laname} "# Is this an already installed
library?\ninstalled=yes\n")
file(APPEND ${_laname} "# Should we warn about portability when linking
against -modules?\nshouldnotlink=yes\n")
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 80e19eb..1b5c9f4 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -333,8 +333,10 @@ int cmComputeLinkDepends::AddLinkEntry(cmLinkItem const&
item)
}
else
{
- // Look for an old-style <item>_LIB_DEPENDS entry.
- if(const char* val = this->Makefile->GetLibDepends(entry.Item))
+ // Look for an old-style <item>_LIB_DEPENDS variable.
+ std::string var = entry.Item;
+ var += "_LIB_DEPENDS";
+ if(const char* val = this->Makefile->GetDefinition(var))
{
// The item dependencies are known. Follow them.
BFSEntry qe = {index, val};
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index e489ad2..9411555 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -481,16 +481,6 @@ int
cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
fprintf(fout, "set(CMAKE_LINK_SEARCH_END_STATIC \"%s\")\n", lssDef);
}
- /* Set the appropriate policy information for ENABLE_EXPORTS */
- fprintf(fout, "cmake_policy(SET CMP0065 %s)\n",
- this->Makefile->GetPolicyStatus(cmPolicies::CMP0065) ==
- cmPolicies::NEW ? "NEW" : "OLD");
- if(const char *ee = this->Makefile->GetDefinition(
- "CMAKE_ENABLE_EXPORTS"))
- {
- fprintf(fout, "set(CMAKE_ENABLE_EXPORTS %s)\n", ee);
- }
-
/* Put the executable at a known location (for COPY_FILE). */
fprintf(fout, "set(CMAKE_RUNTIME_OUTPUT_DIRECTORY \"%s\")\n",
this->BinaryDirectory.c_str());
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index e2aa796..b360c22 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1533,47 +1533,13 @@ void cmLocalGenerator::OutputLinkLibraries(std::string&
linkLibraries,
this->Makefile->GetSafeDefinition("CMAKE_LIBRARY_PATH_TERMINATOR");
// Flags to link an executable to shared libraries.
+ std::string linkFlagsVar = "CMAKE_SHARED_LIBRARY_LINK_";
+ linkFlagsVar += linkLanguage;
+ linkFlagsVar += "_FLAGS";
if( tgt.GetType() == cmTarget::EXECUTABLE )
{
- bool add_shlib_flags = false;
- switch(tgt.Target->GetPolicyStatusCMP0065())
- {
- case cmPolicies::WARN:
- if(!tgt.GetPropertyAsBool("ENABLE_EXPORTS") &&
- this->Makefile->PolicyOptionalWarningEnabled(
- "CMAKE_POLICY_WARNING_CMP0065"))
- {
- std::ostringstream w;
- w << cmPolicies::GetPolicyWarning(cmPolicies::CMP0065) << "\n"
- "For compatibility with older versions of CMake, "
- "additional flags may be added to export symbols on all "
- "executables regardless of thier ENABLE_EXPORTS property.";
- this->Makefile->IssueMessage(cmake::AUTHOR_WARNING, w.str());
- }
- case cmPolicies::OLD:
- // OLD behavior is to always add the flags
- add_shlib_flags = true;
- break;
- case cmPolicies::REQUIRED_IF_USED:
- case cmPolicies::REQUIRED_ALWAYS:
- this->Makefile->IssueMessage(
- cmake::FATAL_ERROR,
- cmPolicies::GetRequiredPolicyError(cmPolicies::CMP0065)
- );
- case cmPolicies::NEW:
- // NEW behavior is to only add the flags if ENABLE_EXPORTS is on
- add_shlib_flags = tgt.GetPropertyAsBool("ENABLE_EXPORTS");
- break;
- }
-
- if(add_shlib_flags)
- {
- std::string linkFlagsVar = "CMAKE_SHARED_LIBRARY_LINK_";
- linkFlagsVar += linkLanguage;
- linkFlagsVar += "_FLAGS";
- linkLibs = this->Makefile->GetSafeDefinition(linkFlagsVar);
- linkLibs += " ";
- }
+ linkLibs = this->Makefile->GetSafeDefinition(linkFlagsVar);
+ linkLibs += " ";
}
// Append the framework search path flags.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 83c8e32..8a3d197 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -210,58 +210,6 @@ cmBacktraceRange
cmMakefile::GetCompileDefinitionsBacktraces() const
.GetCompileDefinitionsEntryBacktraces();
}
-static std::string target_lib_depends_property(std::string const& target)
-{
- return "cmake_" + target + "_lib_depends";
-}
-
-const char* cmMakefile::GetLibDepends(std::string const& target) const
-{
- cmake* cm = this->GetCMakeInstance();
- return cm->GetProperty(target_lib_depends_property(target));
-}
-
-void cmMakefile::SetLibDepends(std::string const& target,
- std::string const& value)
-{
- cmake* cm = this->GetCMakeInstance();
- cm->SetProperty(target_lib_depends_property(target), value.c_str());
-
- switch (this->GetPolicyStatus(cmPolicies::CMP0066))
- {
- case cmPolicies::WARN:
- // No sense in warning about this...the variable is pretty much always
- // used.
- case cmPolicies::OLD:
- // OLD behavior is to set a variable.
- this->AddCacheDefinition( target + "_LIB_DEPENDS", value.c_str(),
- "Dependencies for the target",
- cmState::STATIC );
- break;
- case cmPolicies::REQUIRED_IF_USED:
- case cmPolicies::REQUIRED_ALWAYS:
- case cmPolicies::NEW:
- // NEW behavior is to not set a variable.
- break;
- }
-}
-
-bool cmMakefile::CheckLibDepends(std::string const& target) const
-{
- if (this->GetLibDepends(target))
- {
- std::string message = "Target ";
- message += target;
- message += " has dependency information when it shouldn't.\n";
- message += "Your cache is probably stale. Please remove the entry\n ";
- message += target_lib_depends_property(target);
- message += "\nfrom the cache.";
- cmSystemTools::Error( message.c_str() );
- return false;
- }
- return true;
-}
-
//----------------------------------------------------------------------------
cmListFileBacktrace cmMakefile::GetBacktrace() const
{
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index ee94fbe..3cf20a6 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -750,11 +750,6 @@ public:
cmStringRange GetCompileDefinitionsEntries() const;
cmBacktraceRange GetCompileDefinitionsBacktraces() const;
- const char* GetLibDepends(std::string const& target) const;
- void SetLibDepends(std::string const& target,
- std::string const& value);
- bool CheckLibDepends(std::string const& target) const;
-
bool IsConfigured() const { return this->Configured; }
void SetConfigured(){ this->Configured = true; }
diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h
index 88bd6e2..a791b89 100644
--- a/Source/cmPolicies.h
+++ b/Source/cmPolicies.h
@@ -220,14 +220,7 @@ class cmPolicy;
3, 3, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0064, \
"Support new TEST if() operator.", \
- 3, 3, 0, cmPolicies::WARN) \
- SELECT(POLICY, CMP0065, \
- "Only use additional flags to export symbols on executables with " \
- "the ENABLE_EXPORTS property.", \
- 3, 3, 0, cmPolicies::WARN) \
- SELECT(POLICY, CMP0066, \
- "Deprecate _LIB_DEPENDS variables.", \
- 3, 4, 0, cmPolicies::WARN)
+ 3, 3, 0, cmPolicies::WARN)
#define CM_SELECT_ID(F, A1, A2, A3, A4, A5, A6) F(A1)
#define CM_FOR_EACH_POLICY_ID(POLICY) \
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 3316749..3425f34 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -347,7 +347,6 @@ void cmTarget::SetMakefile(cmMakefile* mf)
{
this->SetPropertyDefault("ANDROID_GUI", 0);
this->SetPropertyDefault("CROSSCOMPILING_EMULATOR", 0);
- this->SetPropertyDefault("ENABLE_EXPORTS", 0);
}
if(this->TargetTypeValue == cmTarget::SHARED_LIBRARY
|| this->TargetTypeValue == cmTarget::MODULE_LIBRARY)
@@ -1026,13 +1025,25 @@ void cmTarget::ClearDependencyInformation( cmMakefile&
mf,
{
// Clear the dependencies. The cache variable must exist iff we are
// recording dependency information for this target.
+ std::string depname = target;
+ depname += "_LIB_DEPENDS";
if (this->RecordDependencies)
{
- mf.SetLibDepends(target, "");
+ mf.AddCacheDefinition(depname, "",
+ "Dependencies for target", cmState::STATIC);
}
else
{
- mf.CheckLibDepends(target);
+ if (mf.GetDefinition( depname ))
+ {
+ std::string message = "Target ";
+ message += target;
+ message += " has dependency information when it shouldn't.\n";
+ message += "Your cache is probably stale. Please remove the entry\n ";
+ message += depname;
+ message += "\nfrom the cache.";
+ cmSystemTools::Error( message.c_str() );
+ }
}
}
@@ -1165,8 +1176,10 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf,
// will be appropriately eliminated at emit time.
if(this->RecordDependencies)
{
+ std::string targetEntry = target;
+ targetEntry += "_LIB_DEPENDS";
std::string dependencies;
- const char* old_val = mf.GetLibDepends(target);
+ const char* old_val = mf.GetDefinition( targetEntry );
if( old_val )
{
dependencies += old_val;
@@ -1186,7 +1199,9 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf,
dependencies += ";";
dependencies += lib;
dependencies += ";";
- mf.SetLibDepends(target, dependencies);
+ mf.AddCacheDefinition( targetEntry, dependencies.c_str(),
+ "Dependencies for the target",
+ cmState::STATIC );
}
}
@@ -1481,7 +1496,7 @@ void cmTarget::GatherDependenciesForVS6( const
cmMakefile& mf,
return;
}
- const char* deps = mf.GetLibDepends(lib.first);
+ const char* deps = mf.GetDefinition( lib.first+"_LIB_DEPENDS" );
if( deps && strcmp(deps,"") != 0 )
{
// Make sure this library is in the map, even if it has an empty
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 3e71dbd..c86ec24 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -41,8 +41,7 @@
F(CMP0046) \
F(CMP0052) \
F(CMP0060) \
- F(CMP0063) \
- F(CMP0065)
+ F(CMP0063)
class cmake;
class cmMakefile;
diff --git a/Tests/RunCMake/CMP0065/BuildTargetInSubProject.cmake
b/Tests/RunCMake/CMP0065/BuildTargetInSubProject.cmake
deleted file mode 100644
index 9339e46..0000000
--- a/Tests/RunCMake/CMP0065/BuildTargetInSubProject.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-function(BuildTargetInSubProject P T E)
- try_compile(RESULTVAR
- ${CMAKE_CURRENT_BINARY_DIR}/subproject
- ${CMAKE_CURRENT_SOURCE_DIR}/subproject
- ${P} ${T} OUTPUT_VARIABLE O)
- if(E AND RESULTVAR)
- message(STATUS "${P} target ${T} succeeded as expected")
- elseif(E AND NOT RESULTVAR)
- message(FATAL_ERROR "${P} target ${T} failed but should have succeeded.
Output:${O}")
- elseif(NOT E AND NOT RESULTVAR)
- message(STATUS "${P} target ${T} failed as expected")
- elseif(NOT E AND RESULTVAR)
- message(FATAL_ERROR "${P} target ${T} succeeded but should have failed.
Output:${O}")
- endif()
-endfunction()
diff --git a/Tests/RunCMake/CMP0065/CMakeLists.txt
b/Tests/RunCMake/CMP0065/CMakeLists.txt
deleted file mode 100644
index 74b3ff8..0000000
--- a/Tests/RunCMake/CMP0065/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-cmake_minimum_required(VERSION 3.3)
-project(${RunCMake_TEST} NONE)
-include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/CMP0065/NEWBad.cmake
b/Tests/RunCMake/CMP0065/NEWBad.cmake
deleted file mode 100644
index 79d9adb..0000000
--- a/Tests/RunCMake/CMP0065/NEWBad.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-enable_language(C)
-include(BuildTargetInSubProject.cmake)
-
-BuildTargetInSubProject(TestPolicyCMP0065 FooNEWBad FALSE)
diff --git a/Tests/RunCMake/CMP0065/NEWGood.cmake
b/Tests/RunCMake/CMP0065/NEWGood.cmake
deleted file mode 100644
index a5b5d04..0000000
--- a/Tests/RunCMake/CMP0065/NEWGood.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-enable_language(C)
-include(BuildTargetInSubProject.cmake)
-
-BuildTargetInSubProject(TestPolicyCMP0065 FooNEWGood TRUE)
diff --git a/Tests/RunCMake/CMP0065/OLDBad1.cmake
b/Tests/RunCMake/CMP0065/OLDBad1.cmake
deleted file mode 100644
index 6d780b4..0000000
--- a/Tests/RunCMake/CMP0065/OLDBad1.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-enable_language(C)
-include(BuildTargetInSubProject.cmake)
-
-BuildTargetInSubProject(TestPolicyCMP0065 FooOLDBad1 FALSE)
diff --git a/Tests/RunCMake/CMP0065/OLDBad2.cmake
b/Tests/RunCMake/CMP0065/OLDBad2.cmake
deleted file mode 100644
index 7196473..0000000
--- a/Tests/RunCMake/CMP0065/OLDBad2.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-enable_language(C)
-include(BuildTargetInSubProject.cmake)
-
-BuildTargetInSubProject(TestPolicyCMP0065 FooOLDBad2 FALSE)
diff --git a/Tests/RunCMake/CMP0065/RunCMakeTest.cmake
b/Tests/RunCMake/CMP0065/RunCMakeTest.cmake
deleted file mode 100644
index 31bafaf..0000000
--- a/Tests/RunCMake/CMP0065/RunCMakeTest.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-include(RunCMake)
-
-run_cmake(OLDBad1)
-run_cmake(OLDBad2)
-run_cmake(NEWBad)
-run_cmake(NEWGood)
diff --git a/Tests/RunCMake/CMP0065/subproject/CMakeLists.txt
b/Tests/RunCMake/CMP0065/subproject/CMakeLists.txt
deleted file mode 100644
index 2f081ba..0000000
--- a/Tests/RunCMake/CMP0065/subproject/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-cmake_minimum_required(VERSION 3.2)
-
-project(TestPolicyCMP0065 C)
-set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS BADFLAGS)
-
-#----------------------------------------------------------------------
-cmake_policy(SET CMP0065 OLD)
-add_executable(FooOLDBad1 main.c)
-
-#----------------------------------------------------------------------
-cmake_policy(SET CMP0065 OLD)
-add_executable(FooOLDBad2 main.c)
-set_target_properties(FooOLDBad2 PROPERTIES ENABLE_EXPORTS ON)
-
-#----------------------------------------------------------------------
-cmake_policy(SET CMP0065 NEW)
-add_executable(FooNEWGood main.c)
-
-#----------------------------------------------------------------------
-cmake_policy(SET CMP0065 NEW)
-add_executable(FooNEWBad main.c)
-set_target_properties(FooNEWBad PROPERTIES ENABLE_EXPORTS ON)
diff --git a/Tests/RunCMake/CMP0065/subproject/main.c
b/Tests/RunCMake/CMP0065/subproject/main.c
deleted file mode 100644
index 98725db..0000000
--- a/Tests/RunCMake/CMP0065/subproject/main.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdio.h>
-
-int main(int argc, char **argv)
-{
- printf("Hello World\n");
- return 0;
-}
diff --git a/Tests/RunCMake/CMP0066/CMP0066-NEW.cmake
b/Tests/RunCMake/CMP0066/CMP0066-NEW.cmake
deleted file mode 100644
index c204610..0000000
--- a/Tests/RunCMake/CMP0066/CMP0066-NEW.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-cmake_policy(SET CMP0066 NEW)
-enable_language(C)
-
-add_library(cmp0066test test.c)
-if (DEFINED cmp0066test_LIB_DEPENDS)
- message(FATAL_ERROR "_LIB_DEPENDS variable is not supposed to be defined")
-endif ()
diff --git a/Tests/RunCMake/CMP0066/CMP0066-OLD.cmake
b/Tests/RunCMake/CMP0066/CMP0066-OLD.cmake
deleted file mode 100644
index d42e26d..0000000
--- a/Tests/RunCMake/CMP0066/CMP0066-OLD.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-cmake_policy(SET CMP0066 OLD)
-enable_language(C)
-
-add_library(cmp0066test test.c)
-if (NOT DEFINED cmp0066test_LIB_DEPENDS)
- message(FATAL_ERROR "_LIB_DEPENDS variable is supposed to be defined")
-endif ()
diff --git a/Tests/RunCMake/CMP0066/CMP0066-WARN.cmake
b/Tests/RunCMake/CMP0066/CMP0066-WARN.cmake
deleted file mode 100644
index d42e26d..0000000
--- a/Tests/RunCMake/CMP0066/CMP0066-WARN.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-cmake_policy(SET CMP0066 OLD)
-enable_language(C)
-
-add_library(cmp0066test test.c)
-if (NOT DEFINED cmp0066test_LIB_DEPENDS)
- message(FATAL_ERROR "_LIB_DEPENDS variable is supposed to be defined")
-endif ()
diff --git a/Tests/RunCMake/CMP0066/CMakeLists.txt
b/Tests/RunCMake/CMP0066/CMakeLists.txt
deleted file mode 100644
index 74b3ff8..0000000
--- a/Tests/RunCMake/CMP0066/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-cmake_minimum_required(VERSION 3.3)
-project(${RunCMake_TEST} NONE)
-include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/CMP0066/RunCMakeTest.cmake
b/Tests/RunCMake/CMP0066/RunCMakeTest.cmake
deleted file mode 100644
index a19ae6c..0000000
--- a/Tests/RunCMake/CMP0066/RunCMakeTest.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-include(RunCMake)
-
-run_cmake(CMP0066-OLD)
-run_cmake(CMP0066-WARN)
-run_cmake(CMP0066-NEW)
diff --git a/Tests/RunCMake/CMP0066/test.c b/Tests/RunCMake/CMP0066/test.c
deleted file mode 100644
index c061e4b..0000000
--- a/Tests/RunCMake/CMP0066/test.c
+++ /dev/null
@@ -1,4 +0,0 @@
-int test()
-{
- return 0;
-}
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index c0fea67..241cf90 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -104,14 +104,6 @@ add_RunCMake_test(CMP0057)
add_RunCMake_test(CMP0059)
add_RunCMake_test(CMP0060)
add_RunCMake_test(CMP0064)
-add_RunCMake_test(CMP0066)
-
-# The test for Policy 65 requires the use of the
-# CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS variable, which both the VS and Xcode
-# generators ignore. The policy will have no effect on those generators.
-if(NOT CMAKE_GENERATOR MATCHES "Visual Studio|Xcode")
- add_RunCMake_test(CMP0065)
-endif()
if(CMAKE_GENERATOR MATCHES "Make")
add_RunCMake_test(Make)
endif()
diff --git a/Tests/RunCMake/TargetPolicies/PolicyList-stderr.txt
b/Tests/RunCMake/TargetPolicies/PolicyList-stderr.txt
index 57047fb..d0aa995 100644
--- a/Tests/RunCMake/TargetPolicies/PolicyList-stderr.txt
+++ b/Tests/RunCMake/TargetPolicies/PolicyList-stderr.txt
@@ -19,7 +19,6 @@
\* CMP0052
\* CMP0060
\* CMP0063
- \* CMP0065
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)
-----------------------------------------------------------------------
Summary of changes:
Help/command/try_compile.rst | 3 --
Help/manual/cmake-policies.7.rst | 2 -
Help/manual/cmake-variables.7.rst | 1 -
Help/policy/CMP0065.rst | 14 ------
Help/policy/CMP0066.rst | 16 ------
Help/prop_tgt/ENABLE_EXPORTS.rst | 5 +-
Help/release/dev/lib_depends-in-property.rst | 7 ---
Help/variable/CMAKE_ENABLE_EXPORTS.rst | 22 ---------
Modules/KDE3Macros.cmake | 1 +
Source/cmComputeLinkDepends.cxx | 6 ++-
Source/cmCoreTryCompile.cxx | 10 ----
Source/cmLocalGenerator.cxx | 44 ++---------------
Source/cmMakefile.cxx | 52 --------------------
Source/cmMakefile.h | 5 --
Source/cmPolicies.h | 9 +---
Source/cmTarget.cxx | 27 +++++++---
Source/cmTarget.h | 3 +-
.../RunCMake/CMP0065/BuildTargetInSubProject.cmake | 15 ------
Tests/RunCMake/CMP0065/CMakeLists.txt | 3 --
Tests/RunCMake/CMP0065/NEWBad.cmake | 4 --
Tests/RunCMake/CMP0065/NEWGood.cmake | 4 --
Tests/RunCMake/CMP0065/OLDBad1.cmake | 4 --
Tests/RunCMake/CMP0065/OLDBad2.cmake | 4 --
Tests/RunCMake/CMP0065/RunCMakeTest.cmake | 6 ---
Tests/RunCMake/CMP0065/subproject/CMakeLists.txt | 22 ---------
Tests/RunCMake/CMP0065/subproject/main.c | 7 ---
Tests/RunCMake/CMP0066/CMP0066-NEW.cmake | 7 ---
Tests/RunCMake/CMP0066/CMP0066-OLD.cmake | 7 ---
Tests/RunCMake/CMP0066/CMP0066-WARN.cmake | 7 ---
Tests/RunCMake/CMP0066/CMakeLists.txt | 3 --
Tests/RunCMake/CMP0066/RunCMakeTest.cmake | 5 --
Tests/RunCMake/CMP0066/test.c | 4 --
Tests/RunCMake/CMakeLists.txt | 8 ---
.../RunCMake/TargetPolicies/PolicyList-stderr.txt | 1 -
34 files changed, 34 insertions(+), 304 deletions(-)
delete mode 100644 Help/policy/CMP0065.rst
delete mode 100644 Help/policy/CMP0066.rst
delete mode 100644 Help/release/dev/lib_depends-in-property.rst
delete mode 100644 Help/variable/CMAKE_ENABLE_EXPORTS.rst
delete mode 100644 Tests/RunCMake/CMP0065/BuildTargetInSubProject.cmake
delete mode 100644 Tests/RunCMake/CMP0065/CMakeLists.txt
delete mode 100644 Tests/RunCMake/CMP0065/NEWBad.cmake
delete mode 100644 Tests/RunCMake/CMP0065/NEWGood.cmake
delete mode 100644 Tests/RunCMake/CMP0065/OLDBad1.cmake
delete mode 100644 Tests/RunCMake/CMP0065/OLDBad2.cmake
delete mode 100644 Tests/RunCMake/CMP0065/RunCMakeTest.cmake
delete mode 100644 Tests/RunCMake/CMP0065/subproject/CMakeLists.txt
delete mode 100644 Tests/RunCMake/CMP0065/subproject/main.c
delete mode 100644 Tests/RunCMake/CMP0066/CMP0066-NEW.cmake
delete mode 100644 Tests/RunCMake/CMP0066/CMP0066-OLD.cmake
delete mode 100644 Tests/RunCMake/CMP0066/CMP0066-WARN.cmake
delete mode 100644 Tests/RunCMake/CMP0066/CMakeLists.txt
delete mode 100644 Tests/RunCMake/CMP0066/RunCMakeTest.cmake
delete mode 100644 Tests/RunCMake/CMP0066/test.c
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
