Jelajahi Sumber

Merge topic 'fix-Qt5Autogen-test'

6af9fa12 Tests: Don't hang when running Qt5Autogen built with GCC 5 (#15570).
Brad King 10 tahun lalu
induk
melakukan
91611c39eb
1 mengubah file dengan 2 tambahan dan 2 penghapusan
  1. 2 2
      Tests/QtAutogen/CMakeLists.txt

+ 2 - 2
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)