diff options
Diffstat (limited to 'cmake/QtRpathHelpers.cmake')
| -rw-r--r-- | cmake/QtRpathHelpers.cmake | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/cmake/QtRpathHelpers.cmake b/cmake/QtRpathHelpers.cmake index 3dbf5c6764..2150b95e73 100644 --- a/cmake/QtRpathHelpers.cmake +++ b/cmake/QtRpathHelpers.cmake @@ -82,6 +82,12 @@ function(qt_apply_rpaths) return() endif() + # Rpaths explicitly disabled (like for uikit), equivalent to qmake's no_qt_rpath. + # Or feature was turned OFF. + if(QT_DISABLE_RPATH OR NOT QT_FEATURE_rpath) + return() + endif() + cmake_parse_arguments(PARSE_ARGV 0 arg "RELATIVE_RPATH" "TARGET;INSTALL_PATH" @@ -110,21 +116,6 @@ function(qt_apply_rpaths) message(FATAL_ERROR "No INSTALL_PATH given to qt_apply_rpaths.") endif() - # Rpaths explicitly disabled (like for uikit), equivalent to qmake's no_qt_rpath. - # Or feature was turned OFF. - if(QT_DISABLE_RPATH OR NOT QT_FEATURE_rpath) - set_target_properties(${target} PROPERTIES - SKIP_BUILD_RPATH ON - SKIP_INSTALL_RPATH ON - ) - if(APPLE) - set_target_properties(${target} PROPERTIES - MACOSX_RPATH OFF - ) - endif() - return() - endif() - set(rpaths "") # Modify the install path to contain the nested structure of a framework. |