diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-04-01 21:26:35 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-04-06 21:42:37 +0200 |
| commit | 2ea4320bf75ae688e61dd5715fa0fbe46b70017c (patch) | |
| tree | f7fe8ba81075afe7c90be5185b2d7eb1d171f232 /cmake | |
| parent | da6f021b523f72b51cc519334e73261d055d9e9c (diff) | |
CMake: Remove special handling of the 'rpath' feature
configurejson2cmake handles the 'rpath' feature now. There's no need
to special-case it anymore.
Change-Id: I9aa9c9acdeb586de09d8a8d269909f8acb02e40a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBuild.cmake | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 09ac0d0bb8..e8d24a58c6 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -643,13 +643,6 @@ function(qt_generate_global_config_pri_file) set(qt_build_config_type "static") endif() - # configure2cmake skips the "rpath" feature, so emulate it here for qmake support: - if(CMAKE_SKIP_RPATH) - list(APPEND disabled_features rpath) - elseif(LINUX OR APPLE) - list(APPEND enabled_features rpath) - endif() - string (REPLACE ";" " " enabled_features "${enabled_features}") string (REPLACE ";" " " disabled_features "${disabled_features}") |