feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake Deployment: Fix qt.conf for macOS

Browse Source 
Change-Id: Ic31709512923aa98271c50ed991cad5effbb3473
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Cristian Adam
2020-02-03 17:43:11 +01:00
parent c0637b8283
commit 625fd913e5
1 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/QtCreatorDeployment.cmake
View File

@@ -11,15 +11,12 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16)
if (WIN32) if (WIN32)
set(qt5_plugin_dest_dir ${IDE_BIN_PATH}/plugins) set(qt5_plugin_dest_dir ${IDE_BIN_PATH}/plugins)
set(qt5_qml_dest_dir ${IDE_BIN_PATH}/qml) set(qt5_qml_dest_dir ${IDE_BIN_PATH}/qml)
set(qt_conf_dir ${IDE_APP_PATH})
elseif(APPLE) elseif(APPLE)
set(qt5_plugin_dest_dir ${IDE_PLUGIN_PATH}) set(qt5_plugin_dest_dir ${IDE_PLUGIN_PATH})
set(qt5_qml_dest_dir ${IDE_DATA_PATH}/../Imports/qtquick2) set(qt5_qml_dest_dir ${IDE_DATA_PATH}/../Imports/qtquick2)
set(qt_conf_dir ${IDE_DATA_PATH})
else() else()
set(qt5_plugin_dest_dir ${IDE_LIBRARY_BASE_PATH}/Qt/plugins) set(qt5_plugin_dest_dir ${IDE_LIBRARY_BASE_PATH}/Qt/plugins)
set(qt5_qml_dest_dir ${IDE_LIBRARY_BASE_PATH}/Qt/qml) set(qt5_qml_dest_dir ${IDE_LIBRARY_BASE_PATH}/Qt/qml)
set(qt_conf_dir ${IDE_APP_PATH})
endif() endif()
foreach(plugin foreach(plugin
@@ -46,29 +43,40 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16)
) )
install(CODE " install(CODE "
get_filename_component(install_prefix \"\${CMAKE_INSTALL_PREFIX}\" ABSOLUTE) function(create_qt_conf location base_dir)
file(RELATIVE_PATH qt_conf_binaries get_filename_component(install_prefix \"\${CMAKE_INSTALL_PREFIX}\" ABSOLUTE)
\"\${install_prefix}/${qt_conf_dir}\" file(RELATIVE_PATH qt_conf_binaries
\"\${install_prefix}/${IDE_BIN_PATH}\" \"\${install_prefix}/\${base_dir}\"
) \"\${install_prefix}/${IDE_BIN_PATH}\"
if (NOT qt_conf_binaries) )
set(qt_conf_binaries .) if (NOT qt_conf_binaries)
endif() set(qt_conf_binaries .)
file(RELATIVE_PATH qt_conf_plugins endif()
\"\${install_prefix}/${qt_conf_dir}\" file(RELATIVE_PATH qt_conf_plugins
\"\${install_prefix}/${qt5_plugin_dest_dir}\" \"\${install_prefix}/\${base_dir}\"
) \"\${install_prefix}/${qt5_plugin_dest_dir}\"
file(RELATIVE_PATH qt_conf_qml )
\"\${install_prefix}/${qt_conf_dir}\" file(RELATIVE_PATH qt_conf_qml
\"\${install_prefix}/${qt5_qml_dest_dir}\" \"\${install_prefix}/\${base_dir}\"
) \"\${install_prefix}/${qt5_qml_dest_dir}\"
)
file(WRITE \"\${CMAKE_INSTALL_PREFIX}/\${location}/qt.conf\"
\"[Paths]\n\"
\"Binaries=\${qt_conf_binaries}\n\"
\"Plugins=\${qt_conf_plugins}\n\"
\"Qml2Imports=\${qt_conf_qml}\n\"
)
endfunction()
if(APPLE)
create_qt_conf(\"${IDE_DATA_PATH}\" \"${IDE_DATA_PATH}/..\")
create_qt_conf(\"${IDE_LIBEXEC_PATH}\" \"${IDE_DATA_PATH}/..\")
else()
create_qt_conf(\"${IDE_APP_PATH}\" \"${IDE_APP_PATH}\")
create_qt_conf(\"${IDE_LIBEXEC_PATH}\" \"${IDE_LIBEXEC_PATH}\")
endif()
file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qt_conf_dir}/qt.conf\"
\"[Paths]\n\"
\"Binaries=\${qt_conf_binaries}\n\"
\"Plugins=\${qt_conf_plugins}\n\"
\"Qml2Imports=\${qt_conf_qml}\n\"
)
" "
COMPONENT Dependencies EXCLUDE_FROM_ALL COMPONENT Dependencies EXCLUDE_FROM_ALL
) )