1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Remove special handling of the 'rpath' feature

Browse Source 
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>
This commit is contained in:
Joerg Bornemann 2020-04-01 21:26:35 +02:00
parent da6f021b52
commit 2ea4320bf7
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/QtBuild.cmake
View File

@ -643,13 +643,6 @@ function(qt_generate_global_config_pri_file)
set(qt_build_config_type "static") set(qt_build_config_type "static")
endif() 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 ";" " " enabled_features "${enabled_features}")
string (REPLACE ";" " " disabled_features "${disabled_features}") string (REPLACE ";" " " disabled_features "${disabled_features}")