summaryrefslogtreecommitdiffstats
path: root/Tests/QtAutogen
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-06-21 12:50:50 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-06-21 12:50:50 (GMT)
commit6af9fa1294e86d61b01034e0c9f12375d69f3120 (patch)
treee75f13ad44f45542e7b7631e36fb8f5720f243ca /Tests/QtAutogen
parent664156c2314302ad94c684561fdf56c847613de9 (diff)
downloadCMake-6af9fa1294e86d61b01034e0c9f12375d69f3120.zip
CMake-6af9fa1294e86d61b01034e0c9f12375d69f3120.tar.gz
CMake-6af9fa1294e86d61b01034e0c9f12375d69f3120.tar.bz2
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.
Diffstat (limited to 'Tests/QtAutogen')
-rw-r--r--Tests/QtAutogen/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
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)