diff options
| author | David Cole <david.cole@kitware.com> | 2012-08-20 19:40:03 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-08-20 19:40:03 (GMT) |
| commit | 0075e7e033281f52eedc307408d982dc0da56763 (patch) | |
| tree | 24f49299655b3fc670f3fbc9a1838209794aa953 /Modules | |
| parent | c2022eb06d843ab39397159100830cc72d18b8d4 (diff) | |
| parent | 1e3248c9d0396e9c8b417eb35636ed951ca85988 (diff) | |
| download | CMake-0075e7e033281f52eedc307408d982dc0da56763.zip CMake-0075e7e033281f52eedc307408d982dc0da56763.tar.gz CMake-0075e7e033281f52eedc307408d982dc0da56763.tar.bz2 | |
Merge topic 'deployqt4-destdir'
1e3248c DeployQt4: Include DESTDIR for some cpack generators.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/DeployQt4.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/DeployQt4.cmake b/Modules/DeployQt4.cmake index 6190abe..309fce3 100644 --- a/Modules/DeployQt4.cmake +++ b/Modules/DeployQt4.cmake @@ -101,7 +101,7 @@ function(resolve_qt4_paths paths_var) if(${executable_path}) list(APPEND paths_resolved "${executable_path}/${path}") else() - list(APPEND paths_resolved "\${CMAKE_INSTALL_PREFIX}/${path}") + list(APPEND paths_resolved "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${path}") endif() endif() endforeach() @@ -295,7 +295,7 @@ function(install_qt4_executable executable) install(CODE "include(\"${DeployQt4_cmake_dir}/DeployQt4.cmake\") set(BU_CHMOD_BUNDLE_ITEMS TRUE) - FIXUP_QT4_EXECUTABLE(\"\${CMAKE_INSTALL_PREFIX}/${executable}\" \"\" \"${libs}\" \"${dirs}\" \"${plugins_dir}\" \"${request_qt_conf}\")" + FIXUP_QT4_EXECUTABLE(\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${executable}\" \"\" \"${libs}\" \"${dirs}\" \"${plugins_dir}\" \"${request_qt_conf}\")" ${component} ) endfunction() |