Merge topic 'fix-Qt5Autogen-test'
6af9fa12
Tests: Don't hang when running Qt5Autogen built with GCC 5 (#15570).
This commit is contained in:
commit
91611c39eb
|
@ -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)
|
||||||
|
|
Loading…
Reference in New Issue