[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-533-g295f35d

[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  295f35d4a302e844c9acf7277122d9d2308f262b (commit)
       via  6af9fa1294e86d61b01034e0c9f12375d69f3120 (commit)
      from  e7c86afe9b8913a8b76c75fdcb83b85f511949d2 (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=295f35d4a302e844c9acf7277122d9d2308f262b
commit 295f35d4a302e844c9acf7277122d9d2308f262b
Merge: e7c86af 6af9fa1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jun 21 08:54:50 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jun 21 08:54:50 2015 -0400

    Merge topic 'fix-Qt5Autogen-test' into next
    
    6af9fa12 Tests: Don't hang when running Qt5Autogen built with GCC 5 (#15570).


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6af9fa1294e86d61b01034e0c9f12375d69f3120
commit 6af9fa1294e86d61b01034e0c9f12375d69f3120
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jun 21 14:50:50 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jun 21 14:50:50 2015 +0200

    Tests: Don't hang when running Qt5Autogen built with GCC 5 (#15570).
    
    Since Qt 5.4.2, it is necessary to compile against Qt 5 with -fPIC
    and not -fPIE when using GCC 5.  Not doing so results in a hanging
    test in this case, so use the PIC flag directly instead.

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 60b44fd..54ee8f5 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -34,8 +34,8 @@ else()
   include_directories(${Qt5Widgets_INCLUDE_DIRS})
   set(QT_LIBRARIES Qt5::Widgets)
 
-  if(Qt5_POSITION_INDEPENDENT_CODE)
-    set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+  if(Qt5_POSITION_INDEPENDENT_CODE AND CMAKE_CXX_COMPILE_OPTIONS_PIC)
+    add_definitions(${CMAKE_CXX_COMPILE_OPTIONS_PIC})
   endif()
 
   macro(qtx_wrap_cpp)

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

Summary of changes:
 Tests/QtAutogen/CMakeLists.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake