diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-22 17:00:27 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-06-22 17:00:27 (GMT) |
| commit | 91611c39eb58006ced851f9eff50dd721c516aab (patch) | |
| tree | 1a12005c60704448eaf530fd23c9475ca52bfbf5 | |
| parent | 8848298831e435909b52cb015d5b8d2b985f507b (diff) | |
| parent | 6af9fa1294e86d61b01034e0c9f12375d69f3120 (diff) | |
| download | CMake-91611c39eb58006ced851f9eff50dd721c516aab.zip CMake-91611c39eb58006ced851f9eff50dd721c516aab.tar.gz CMake-91611c39eb58006ced851f9eff50dd721c516aab.tar.bz2 | |
Merge topic 'fix-Qt5Autogen-test'
6af9fa12 Tests: Don't hang when running Qt5Autogen built with GCC 5 (#15570).
| -rw-r--r-- | Tests/QtAutogen/CMakeLists.txt | 4 |
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) |