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.
This commit is contained in:
Stephen Kelly 2015-06-21 14:50:50 +02:00
parent 664156c231
commit 6af9fa1294
1 changed files with 2 additions and 2 deletions

View File

@ -34,8 +34,8 @@ else()
include_directories(${Qt5Widgets_INCLUDE_DIRS}) include_directories(${Qt5Widgets_INCLUDE_DIRS})
set(QT_LIBRARIES Qt5::Widgets) set(QT_LIBRARIES Qt5::Widgets)
if(Qt5_POSITION_INDEPENDENT_CODE) if(Qt5_POSITION_INDEPENDENT_CODE AND CMAKE_CXX_COMPILE_OPTIONS_PIC)
set(CMAKE_POSITION_INDEPENDENT_CODE ON) add_definitions(${CMAKE_CXX_COMPILE_OPTIONS_PIC})
endif() endif()
macro(qtx_wrap_cpp) macro(qtx_wrap_cpp)