[Cmake-commits] CMake branch, next, updated. v2.8.8-3068-g9e0172b

[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  9e0172b255ba5fe3d1d39248da428f70ee4b2cd5 (commit)
       via  f092a2e6e4e515595f7bda535b82580e3883680c (commit)
      from  30bf2c896e979ca24bcd913893394e46288df785 (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=9e0172b255ba5fe3d1d39248da428f70ee4b2cd5
commit 9e0172b255ba5fe3d1d39248da428f70ee4b2cd5
Merge: 30bf2c8 f092a2e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jun 8 10:58:10 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 8 10:58:10 2012 -0400

    Merge topic 'position-independent-targets' into next
    
    f092a2e Resolve warning when bootstrapping with GCC on Win32.


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

    Resolve warning when bootstrapping with GCC on Win32.
    
    The PIC option variables populated in GNU.cmake need to be cleared
    in windows-specific platforms.

diff --git a/Modules/Platform/CYGWIN-GNU.cmake b/Modules/Platform/CYGWIN-GNU.cmake
index 5aad45b..eae313a 100644
--- a/Modules/Platform/CYGWIN-GNU.cmake
+++ b/Modules/Platform/CYGWIN-GNU.cmake
@@ -35,7 +35,10 @@ macro(__cygwin_compiler_gnu lang)
   set(CMAKE_${lang}_LINK_EXECUTABLE
     "<CMAKE_${lang}_COMPILER> <FLAGS> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <OBJECTS>  -o <TARGET> -Wl,--out-implib,<TARGET_IMPLIB> ${CMAKE_GNULD_IMAGE_VERSION} <LINK_LIBRARIES>")
 
-  set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "") # No -fPIC on cygwin
+   # No -fPIC on cygwin
+  set(CMAKE_${lang}_COMPILE_OPTIONS_PIC "")
+  set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "")
+  set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "")
 
   # Initialize C link type selection flags.  These flags are used when
   # building a shared library, shared module, or executable that links
diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake
index dd47692..1a2ee5e 100644
--- a/Modules/Platform/Windows-GNU.cmake
+++ b/Modules/Platform/Windows-GNU.cmake
@@ -77,7 +77,11 @@ macro(__windows_compiler_gnu lang)
     endforeach(type)
   endif()
 
-  set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "") # No -fPIC on Windows
+  # No -fPIC on Windows
+  set(CMAKE_${lang}_COMPILE_OPTIONS_PIC "")
+  set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "")
+  set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "")
+
   set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_OBJECTS ${__WINDOWS_GNU_LD_RESPONSE})
   set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_INCLUDES 1)
 

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

Summary of changes:
 Modules/Platform/CYGWIN-GNU.cmake  |    5 ++++-
 Modules/Platform/Windows-GNU.cmake |    6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake