Merge topic 'fix-Qt5Autogen-test'

6af9fa12 Tests: Don't hang when running Qt5Autogen built with GCC 5 (#15570).
This commit is contained in:
Brad King 2015-06-22 13:00:27 -04:00 committed by CMake Topic Stage
commit 91611c39eb
1 changed files with 2 additions and 2 deletions

View File

@ -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)