[Cmake-commits] CMake branch, next, updated. v2.8.8-3002-g30be8b6
Stephen Kelly
steveire at gmail.com
Tue Jun 5 12:02:20 EDT 2012
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 30be8b658f4b60418bedc7611156a6a1cfd3c397 (commit)
via 5c79fa51eee9eb81b4379870eca2d3ca28d613ec (commit)
from 37759984172555e0b892b26f2cd7410b8eadb5db (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=30be8b658f4b60418bedc7611156a6a1cfd3c397
commit 30be8b658f4b60418bedc7611156a6a1cfd3c397
Merge: 3775998 5c79fa5
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 5 12:02:17 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 5 12:02:17 2012 -0400
Merge topic 'position-independent-targets' into next
5c79fa5 Only run the PositionIndependentCode test on APPLE if it has fPIE.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c79fa51eee9eb81b4379870eca2d3ca28d613ec
commit 5c79fa51eee9eb81b4379870eca2d3ca28d613ec
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 5 18:00:36 2012 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jun 5 18:00:36 2012 +0200
Only run the PositionIndependentCode test on APPLE if it has fPIE.
An old APPLE platform on the dashboard fails otherwise.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 76c45fa..89c838a 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -315,7 +315,15 @@ IF(BUILD_TESTING)
ADD_TEST_MACRO(Module.GenerateExportHeader GenerateExportHeader)
- ADD_TEST_MACRO(PositionIndependentTargets PositionIndependentTargets)
+ if (APPLE)
+ check_cxx_compiler_flag(-fPIE run_pic_test)
+ else()
+ set(run_pic_test 1)
+ endif()
+
+ if (run_pic_test)
+ ADD_TEST_MACRO(PositionIndependentTargets PositionIndependentTargets)
+ endif()
ADD_TEST(LinkFlags-prepare
${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE}
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list