[Cmake-commits] CMake branch, next, updated. v2.8.8-3054-g1dc41a2

[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  1dc41a22bcc63cfc65565b5b6794347ce514a469 (commit)
       via  aee32b45e04c8c66d6193d0ef5815fb308947eb4 (commit)
       via  f65b50835082132f94ba3d426a786072ed02a464 (commit)
      from  a853b40ef775b6edd08d4cf1c892d713076db202 (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=1dc41a22bcc63cfc65565b5b6794347ce514a469
commit 1dc41a22bcc63cfc65565b5b6794347ce514a469
Merge: a853b40 aee32b4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jun 7 06:51:14 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 7 06:51:14 2012 -0400

    Merge topic 'position-independent-targets' into next
    
    aee32b4 Set the CXX DLL COMPILE_OPTION based on the C value.
    f65b508 Exclude the pic test from some platforms.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aee32b45e04c8c66d6193d0ef5815fb308947eb4
commit aee32b45e04c8c66d6193d0ef5815fb308947eb4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jun 7 12:48:27 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jun 7 12:49:56 2012 +0200

    Set the CXX DLL COMPILE_OPTION based on the C value.
    
    To hopefully fix the Watcom based build, and for consistency.
    
    Also make a similar change for fortran.

diff --git a/Modules/CMakeCXXInformation.cmake b/Modules/CMakeCXXInformation.cmake
index 5e09eab..9dc9cbd 100644
--- a/Modules/CMakeCXXInformation.cmake
+++ b/Modules/CMakeCXXInformation.cmake
@@ -108,6 +108,10 @@ IF(NOT CMAKE_CXX_COMPILE_OPTIONS_PIE)
   SET(CMAKE_CXX_COMPILE_OPTIONS_PIE ${CMAKE_C_COMPILE_OPTIONS_PIE})
 ENDIF(NOT CMAKE_CXX_COMPILE_OPTIONS_PIE)
 
+IF(NOT CMAKE_CXX_COMPILE_OPTIONS_DLL)
+  SET(CMAKE_CXX_COMPILE_OPTIONS_DLL ${CMAKE_C_COMPILE_OPTIONS_DLL})
+ENDIF(NOT CMAKE_CXX_COMPILE_OPTIONS_DLL)
+
 IF(NOT CMAKE_SHARED_LIBRARY_CXX_FLAGS)
   SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS ${CMAKE_SHARED_LIBRARY_C_FLAGS})
 ENDIF(NOT CMAKE_SHARED_LIBRARY_CXX_FLAGS)
diff --git a/Modules/CMakeFortranInformation.cmake b/Modules/CMakeFortranInformation.cmake
index 9c82409..d962f4c 100644
--- a/Modules/CMakeFortranInformation.cmake
+++ b/Modules/CMakeFortranInformation.cmake
@@ -82,6 +82,10 @@ IF(NOT CMAKE_Fortran_COMPILE_OPTIONS_PIE)
   SET(CMAKE_Fortran_COMPILE_OPTIONS_PIE ${CMAKE_C_COMPILE_OPTIONS_PIE})
 ENDIF(NOT CMAKE_Fortran_COMPILE_OPTIONS_PIE)
 
+IF(NOT CMAKE_Fortran_COMPILE_OPTIONS_DLL)
+  SET(CMAKE_Fortran_COMPILE_OPTIONS_DLL ${CMAKE_C_COMPILE_OPTIONS_DLL})
+ENDIF(NOT CMAKE_Fortran_COMPILE_OPTIONS_DLL)
+
 # Create a set of shared library variable specific to Fortran
 # For 90% of the systems, these are the same flags as the C versions
 # so if these are not set just copy the flags from the c version

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f65b50835082132f94ba3d426a786072ed02a464
commit f65b50835082132f94ba3d426a786072ed02a464
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jun 7 09:18:38 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Jun 7 12:46:57 2012 +0200

    Exclude the pic test from some platforms.
    
    The switch on GCC compiler version should have been added before too
    as it is used in the Platform file already.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index b5bc5b8..85aa878 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -319,7 +319,15 @@ IF(BUILD_TESTING)
     include(CheckCXXCompilerFlag)
     check_cxx_compiler_flag(-fPIE run_pic_test)
   else()
-    set(run_pic_test 1)
+    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))
+      set(run_pic_test 0)
+    else()
+      set(run_pic_test 1)
+    endif()
   endif()
 
   if (run_pic_test)

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

Summary of changes:
 Modules/CMakeCXXInformation.cmake     |    4 ++++
 Modules/CMakeFortranInformation.cmake |    4 ++++
 Tests/CMakeLists.txt                  |   10 +++++++++-
 3 files changed, 17 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake