diff options
| author | Alex Turbov <i.zaufi@gmail.com> | 2019-12-08 00:39:02 (GMT) |
|---|---|---|
| committer | Alex Turbov <i.zaufi@gmail.com> | 2019-12-10 14:43:27 (GMT) |
| commit | 24fdd51f4503ccee33c07881cc8dd487cdc8b347 (patch) | |
| tree | ff07504a0782e3a79fb996594d9fcbcabf98ecf0 /Modules/DeployQt4.cmake | |
| parent | 90e3e2a7778dc0ec5b421e9657ec49936a3cf174 (diff) | |
| download | CMake-24fdd51f4503ccee33c07881cc8dd487cdc8b347.zip CMake-24fdd51f4503ccee33c07881cc8dd487cdc8b347.tar.gz CMake-24fdd51f4503ccee33c07881cc8dd487cdc8b347.tar.bz2 | |
Refactor: Replace CMAKE_CURRENT_LIST_DIR with CMAKE_CURRENT_FUNCTION_LIST_DIR
Some modules define an intermediate global scope visible variables
to access "resource" files from functions.
Now these variables could be eliminated.
Diffstat (limited to 'Modules/DeployQt4.cmake')
| -rw-r--r-- | Modules/DeployQt4.cmake | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Modules/DeployQt4.cmake b/Modules/DeployQt4.cmake index 4a18927..9aa4383 100644 --- a/Modules/DeployQt4.cmake +++ b/Modules/DeployQt4.cmake @@ -106,7 +106,6 @@ and plugin installation. See documentation of FIXUP_QT4_BUNDLE. # The functions defined in this file depend on the fixup_bundle function # (and others) found in BundleUtilities.cmake -set(DeployQt4_cmake_dir "${CMAKE_CURRENT_LIST_DIR}") set(DeployQt4_apple_plugins_dir "PlugIns") function(write_qt4_conf qt_conf_dir qt_conf_contents) @@ -392,7 +391,7 @@ function(install_qt4_executable executable) resolve_qt4_paths(libs "") install(CODE -"include(\"${DeployQt4_cmake_dir}/DeployQt4.cmake\") +"include(\"${CMAKE_CURRENT_FUNCTION_LIST_DIR}/DeployQt4.cmake\") set(BU_CHMOD_BUNDLE_ITEMS TRUE) FIXUP_QT4_EXECUTABLE(\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${executable}\" \"\" \"${libs}\" \"${dirs}\" \"${plugins_dir}\" \"${request_qt_conf}\")" ${component} |