1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix use of uic when cross-compiling

Browse Source 
Don't try to build uic but instead import it. This is done centrally now
in add_qt_tool.

Change-Id: I241fbb924de68549e9c0320e157351bd7b1bf5c3
Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
This commit is contained in:
Simon Hausmann 2019-02-11 15:50:17 +01:00
parent b2f03791c1
commit c604a1265a
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmake/QtBuild.cmake
View File

@ -761,6 +761,22 @@ endfunction()
# The BOOTSTRAP option allows building it as standalone program, otherwise # The BOOTSTRAP option allows building it as standalone program, otherwise
# it will be linked against QtCore. # it will be linked against QtCore.
function(add_qt_tool name) function(add_qt_tool name)
set01(_build_tools "x${HOST_QT_TOOLS_DIRECTORY}" STREQUAL "x")
if (NOT _build_tools)
message("Searching for ${name}.")
find_program("_PROG_${name}" "${name}" PATHS "${HOST_QT_TOOLS_DIRECTORY}" NO_DEFAULT_PATH)
if (_PROG_${name} STREQUAL "_PROG_${name}-NOTFOUND")
message(FATAL_ERROR "The name \"${name}\" was not found in the "
"HOST_QT_TOOLS_DIRECTORY (\"${HOST_QT_TOOLS_DIRECTORY}\").")
else()
message(STATUS "${name} was found at ${_PROG_${name}}.")
add_executable("${name}" IMPORTED GLOBAL)
set_target_properties("${name}" PROPERTIES IMPORTED_LOCATION "${_PROG_${name}}")
qt_internal_add_target_aliases("${name}")
endif()
return()
endif()
qt_parse_all_arguments(arg "add_qt_tool" "BOOTSTRAP" "" "${__default_private_args}" ${ARGN}) qt_parse_all_arguments(arg "add_qt_tool" "BOOTSTRAP" "" "${__default_private_args}" ${ARGN})
if (arg_BOOTSTRAP) if (arg_BOOTSTRAP)

27
src/CMakeLists.txt
View File

@ -18,32 +18,13 @@ function(find_or_build_bootstrap_names)
# Move these into their own folder and move this code in the CMakeLists.txt file there! # Move these into their own folder and move this code in the CMakeLists.txt file there!
set01(_build_tools "x${HOST_QT_TOOLS_DIRECTORY}" STREQUAL "x") set01(_build_tools "x${HOST_QT_TOOLS_DIRECTORY}" STREQUAL "x")
function(find_or_build_bootstrap_tool name)
if (_build_tools)
add_subdirectory(tools/${name})
else()
message("Searching for ${name}.")
find_program("_PROG_${name}" "${name}" PATHS "${HOST_QT_TOOLS_DIRECTORY}" NO_DEFAULT_PATH)
if (_PROG_${name} STREQUAL "_PROG_${name}-NOTFOUND")
message(FATAL_ERROR "The name \"${name}\" was not found in the "
"HOST_QT_TOOLS_DIRECTORY (\"${HOST_QT_TOOLS_DIRECTORY}\").")
else()
message("${name} was found at ${_PROG_${name}}.")
add_executable("${name}" IMPORTED GLOBAL)
set_target_properties("${name}" PROPERTIES IMPORTED_LOCATION "${_PROG_${name}}")
add_executable("Qt::${name}" ALIAS "${name}")
endif()
endif()
endfunction()
if (_build_tools) if (_build_tools)
add_subdirectory(tools/bootstrap) # bootstrap library add_subdirectory(tools/bootstrap) # bootstrap library
endif() endif()
find_or_build_bootstrap_tool(moc) add_subdirectory(tools/moc)
find_or_build_bootstrap_tool(rcc) add_subdirectory(tools/rcc)
find_or_build_bootstrap_tool(qfloat16-tables) add_subdirectory(tools/qfloat16-tables)
find_or_build_bootstrap_tool(tracegen) add_subdirectory(tools/tracegen)
if (_build_tools) if (_build_tools)
install(EXPORT "Qt${PROJECT_VERSION_MAJOR}ToolsTargets" NAMESPACE "${QT_CMAKE_EXPORT_NAMESPACE}::" DESTINATION "${INSTALL_LIBDIR}/cmake/Qt${PROJECT_VERSION_MAJOR}") install(EXPORT "Qt${PROJECT_VERSION_MAJOR}ToolsTargets" NAMESPACE "${QT_CMAKE_EXPORT_NAMESPACE}::" DESTINATION "${INSTALL_LIBDIR}/cmake/Qt${PROJECT_VERSION_MAJOR}")