[Cmake-commits] CMake branch, next, updated. v2.8.8-3081-geb12de5

[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  eb12de5d79d5a1dce918d736f935359babfc18e1 (commit)
       via  e85b45e3521d72536bcfd6090a5f79261bd291a3 (commit)
      from  5c59e6e8d5babbc9b0941d4dec0a9ebc2a2f9b8d (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=eb12de5d79d5a1dce918d736f935359babfc18e1
commit eb12de5d79d5a1dce918d736f935359babfc18e1
Merge: 5c59e6e e85b45e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jun 8 12:59:19 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 8 12:59:19 2012 -0400

    Merge topic 'position-independent-targets' into next
    
    e85b45e Fix logic for building unit test with GNU.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e85b45e3521d72536bcfd6090a5f79261bd291a3
commit e85b45e3521d72536bcfd6090a5f79261bd291a3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jun 8 18:56:34 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Jun 8 18:56:34 2012 +0200

    Fix logic for building unit test with GNU.
    
    The version of CMake used to run a build of CMake (and its tests)
    would have to be version 2.8.8 or later for the version check to work.
    
    Use the try_compile instead.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 85aa878..68c08a4 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -315,15 +315,14 @@ IF(BUILD_TESTING)
 
   ADD_TEST_MACRO(Module.GenerateExportHeader GenerateExportHeader)
 
-  if (APPLE)
+  if (APPLE OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
     include(CheckCXXCompilerFlag)
     check_cxx_compiler_flag(-fPIE run_pic_test)
   else()
     if (CMAKE_CXX_COMPILER_ID MATCHES "PGI"
         OR CMAKE_CXX_COMPILER_ID MATCHES "PathScale"
         OR CMAKE_SYSTEM_NAME MATCHES "IRIX64"
-        OR CMAKE_CXX_COMPILER_ID MATCHES "Intel"
-        OR (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4))
+        OR CMAKE_CXX_COMPILER_ID MATCHES "Intel")
       set(run_pic_test 0)
     else()
       set(run_pic_test 1)

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

Summary of changes:
 Tests/CMakeLists.txt |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake