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 ab5441a9540c4bf649927845a08214de6152f353 (commit)
via 14161a21f0e873dbc71ef770813494264f6449d8 (commit)
from 53ec40614e8a0e638a9ef83f6b859fe4ec46c0b7 (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=ab5441a9540c4bf649927845a08214de6152f353
commit ab5441a9540c4bf649927845a08214de6152f353
Merge: 53ec406 14161a2
Author: Chuck Atkins <chuck.atk...@kitware.com>
AuthorDate: Mon Sep 14 11:52:51 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Sep 14 11:52:51 2015 -0400
Merge topic 'restrict-shlib-link-flags-to-enable-exports' into next
14161a21 CMP0065: Miscelaneous cleanup
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=14161a21f0e873dbc71ef770813494264f6449d8
commit 14161a21f0e873dbc71ef770813494264f6449d8
Author: Chuck Atkins <chuck.atk...@kitware.com>
AuthorDate: Mon Sep 14 11:49:13 2015 -0400
Commit: Chuck Atkins <chuck.atk...@kitware.com>
CommitDate: Mon Sep 14 11:49:13 2015 -0400
CMP0065: Miscelaneous cleanup
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 36fa610..e2aa796 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1546,7 +1546,7 @@ void cmLocalGenerator::OutputLinkLibraries(std::string&
linkLibraries,
std::ostringstream w;
w << cmPolicies::GetPolicyWarning(cmPolicies::CMP0065) << "\n"
"For compatibility with older versions of CMake, "
- "CMAKE_SHARED_LIBRARY_LINK_<LANG>_FLAGS are being used on all "
+ "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());
}
diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h
index 72f889e..820c9cc 100644
--- a/Source/cmPolicies.h
+++ b/Source/cmPolicies.h
@@ -222,7 +222,7 @@ class cmPolicy;
"Support new TEST if() operator.", \
3, 3, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0065, \
- "Only use CMAKE_SHARED_LIBRARY_LINK_<LANG>_FLAGS on executables with " \
+ "Only use additional flags to export symbols on executables with " \
"the ENABLE_EXPORTS property.", \
3, 3, 0, cmPolicies::WARN)
diff --git a/Tests/RunCMake/CMP0065/NEWBad.cmake
b/Tests/RunCMake/CMP0065/NEWBad.cmake
index e25bc9d..79d9adb 100644
--- a/Tests/RunCMake/CMP0065/NEWBad.cmake
+++ b/Tests/RunCMake/CMP0065/NEWBad.cmake
@@ -1,5 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
-project(TestCMP0065 C)
+enable_language(C)
include(BuildTargetInSubProject.cmake)
BuildTargetInSubProject(TestPolicyCMP0065 FooNEWBad FALSE)
diff --git a/Tests/RunCMake/CMP0065/NEWGood.cmake
b/Tests/RunCMake/CMP0065/NEWGood.cmake
index 66f822d..a5b5d04 100644
--- a/Tests/RunCMake/CMP0065/NEWGood.cmake
+++ b/Tests/RunCMake/CMP0065/NEWGood.cmake
@@ -1,5 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
-project(TestCMP0065 C)
+enable_language(C)
include(BuildTargetInSubProject.cmake)
BuildTargetInSubProject(TestPolicyCMP0065 FooNEWGood TRUE)
diff --git a/Tests/RunCMake/CMP0065/OLDBad1.cmake
b/Tests/RunCMake/CMP0065/OLDBad1.cmake
index 7234808..6d780b4 100644
--- a/Tests/RunCMake/CMP0065/OLDBad1.cmake
+++ b/Tests/RunCMake/CMP0065/OLDBad1.cmake
@@ -1,5 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
-project(TestCMP0065 C)
+enable_language(C)
include(BuildTargetInSubProject.cmake)
BuildTargetInSubProject(TestPolicyCMP0065 FooOLDBad1 FALSE)
diff --git a/Tests/RunCMake/CMP0065/OLDBad2.cmake
b/Tests/RunCMake/CMP0065/OLDBad2.cmake
index 2c877d9..7196473 100644
--- a/Tests/RunCMake/CMP0065/OLDBad2.cmake
+++ b/Tests/RunCMake/CMP0065/OLDBad2.cmake
@@ -1,5 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
-project(TestCMP0065 C)
+enable_language(C)
include(BuildTargetInSubProject.cmake)
BuildTargetInSubProject(TestPolicyCMP0065 FooOLDBad2 FALSE)
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 4049fac..d5d54fc 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -108,8 +108,7 @@ add_RunCMake_test(CMP0064)
# 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") AND
- (NOT CMAKE_GENERATOR MATCHES "Xcode"))
+if(NOT CMAKE_GENERATOR MATCHES "Visual Studio|Xcode")
add_RunCMake_test(CMP0065)
endif()
if(CMAKE_GENERATOR MATCHES "Make")
-----------------------------------------------------------------------
Summary of changes:
Source/cmLocalGenerator.cxx | 2 +-
Source/cmPolicies.h | 2 +-
Tests/RunCMake/CMP0065/NEWBad.cmake | 3 +--
Tests/RunCMake/CMP0065/NEWGood.cmake | 3 +--
Tests/RunCMake/CMP0065/OLDBad1.cmake | 3 +--
Tests/RunCMake/CMP0065/OLDBad2.cmake | 3 +--
Tests/RunCMake/CMakeLists.txt | 3 +--
7 files changed, 7 insertions(+), 12 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
