[Cmake-commits] CMake branch, next, updated. v2.8.8-3329-g5ddf0cd

[Stephen Kelly]

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  5ddf0cddcc1fc600ef650217f1edc8d25a68030c (commit)
       via  92356038952df71894ea1c390f5b5902df8780be (commit)
      from  9da814b1b61b6cdafe30cb0e7d2bbf6a8b7f7fb3 (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=5ddf0cddcc1fc600ef650217f1edc8d25a68030c
commit 5ddf0cddcc1fc600ef650217f1edc8d25a68030c
Merge: 9da814b 9235603
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jun 27 10:42:55 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 27 10:42:55 2012 -0400

    Merge topic 'fix-pie-clang-trunk' into next
    
    9235603 Fix PositionIndependentTargets test with clang trunk.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=92356038952df71894ea1c390f5b5902df8780be
commit 92356038952df71894ea1c390f5b5902df8780be
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jun 27 16:38:57 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Jun 27 16:39:24 2012 +0200

    Fix PositionIndependentTargets test with clang trunk.
    
    The __PIE__ define might be set instead of __PIC__ if fPIE is used.
    
    http://llvm.org/bugs/show_bug.cgi?id=13221

diff --git a/Tests/PositionIndependentTargets/pic_test.h b/Tests/PositionIndependentTargets/pic_test.h
index 3f64557..13cf8f7 100644
--- a/Tests/PositionIndependentTargets/pic_test.h
+++ b/Tests/PositionIndependentTargets/pic_test.h
@@ -1,7 +1,7 @@
 
 #if defined(__ELF__)
-#  if !defined(__PIC__)
-#    error "The POSITION_INDEPENDENT_CODE property should cause __PIC__ to be defined on ELF platforms."
+#  if !defined(__PIC__) && !defined(__PIE__)
+#    error "The POSITION_INDEPENDENT_CODE property should cause __PIC__ or __PIE__ to be defined on ELF platforms."
 #  endif
 #endif
 

-----------------------------------------------------------------------

Summary of changes:
 Tests/PositionIndependentTargets/pic_test.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake