kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'deployqt4-destdir' 

1e3248c DeployQt4:  Include DESTDIR for some cpack generators.
This commit is contained in:
David Cole 2012-08-20 15:40:03 -04:00 committed by CMake Topic Stage
parent c2022eb06d 1e3248c9d0
commit 0075e7e033
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/DeployQt4.cmake
View File

@ -101,7 +101,7 @@ function(resolve_qt4_paths paths_var)
if(${executable_path}) if(${executable_path})
list(APPEND paths_resolved "${executable_path}/${path}") list(APPEND paths_resolved "${executable_path}/${path}")
else() else()
list(APPEND paths_resolved "\${CMAKE_INSTALL_PREFIX}/${path}") list(APPEND paths_resolved "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${path}")
endif() endif()
endif() endif()
endforeach() endforeach()
@ -295,7 +295,7 @@ function(install_qt4_executable executable)
install(CODE install(CODE
"include(\"${DeployQt4_cmake_dir}/DeployQt4.cmake\") "include(\"${DeployQt4_cmake_dir}/DeployQt4.cmake\")
set(BU_CHMOD_BUNDLE_ITEMS TRUE) 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} ${component}
) )
endfunction() endfunction()