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

CMake: Only build QtLibraryInfo if we are building tools

Browse Source 
It is a dependency for qmake and qtpaths. If neither of them are
built, because building tools might be disabled, skip building the
library as well.

Task-number: QTBUG-127334
Change-Id: I0f7d5bc9d9a4539a6d25f7c2d841e9b8978a83a3
Reviewed-by:  Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 82b2c51c3aec148c890d732978ca4a881e5c6f82)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexandru Croitor 2024-07-18 18:33:50 +02:00 committed by Qt Cherry-pick Bot
parent f240a7a2bb
commit abb231a2f0
1 changed files with 44 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
qmake/CMakeLists.txt
View File

@ -8,48 +8,57 @@
##################################################################### #####################################################################
# The common object library, that should be available regardless of the presence of qmake. # The common object library, that should be available regardless of the presence of qmake.
qt_add_library(QtLibraryInfo OBJECT if(QT_WILL_BUILD_TOOLS)
library/proitems.cpp library/proitems.h qt_add_library(QtLibraryInfo OBJECT
library/qmake_global.h library/proitems.cpp library/proitems.h
property.cpp property.h library/qmake_global.h
propertyprinter.cpp propertyprinter.h property.cpp property.h
qmakelibraryinfo.cpp qmakelibraryinfo.h propertyprinter.cpp propertyprinter.h
) qmakelibraryinfo.cpp qmakelibraryinfo.h
qt_internal_add_sbom(QtLibraryInfo )
TYPE QT_MODULE qt_internal_add_sbom(QtLibraryInfo
NO_INSTALL TYPE QT_MODULE
) NO_INSTALL
)
# Make sure we use same parameters when building QtLibraryInfo and other Qt libraries, # Make sure we use same parameters when building QtLibraryInfo and other Qt libraries,
# otherwise some compilers may have compilation errors, such as clang-cl. # otherwise some compilers may have compilation errors, such as clang-cl.
target_link_libraries(QtLibraryInfo PUBLIC PlatformCommonInternal) target_link_libraries(QtLibraryInfo PUBLIC PlatformCommonInternal)
target_link_libraries(QtLibraryInfo PUBLIC Qt::CorePrivate) target_link_libraries(QtLibraryInfo PUBLIC Qt::CorePrivate)
qt_internal_add_sync_header_dependencies(QtLibraryInfo Core) qt_internal_add_sync_header_dependencies(QtLibraryInfo Core)
target_include_directories(QtLibraryInfo PUBLIC target_include_directories(QtLibraryInfo PUBLIC
"${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}"
"${CMAKE_CURRENT_SOURCE_DIR}/library" "${CMAKE_CURRENT_SOURCE_DIR}/library"
) )
# Chop off the "/mkspecs" part of INSTALL_MKSPECSDIR # Chop off the "/mkspecs" part of INSTALL_MKSPECSDIR
get_filename_component(hostdatadir "${INSTALL_MKSPECSDIR}" DIRECTORY) get_filename_component(hostdatadir "${INSTALL_MKSPECSDIR}" DIRECTORY)
if("${hostdatadir}" STREQUAL "") if("${hostdatadir}" STREQUAL "")
set(hostdatadir ".") set(hostdatadir ".")
endif()
target_compile_definitions(QtLibraryInfo PUBLIC
PROEVALUATOR_FULL
QT_BUILD_QMAKE
QT_USE_QSTRINGBUILDER
QT_HOST_MKSPEC="${QT_QMAKE_HOST_MKSPEC}"
QT_TARGET_MKSPEC="${QT_QMAKE_TARGET_MKSPEC}"
QT_HOST_DATADIR="${hostdatadir}"
)
qt_internal_set_exceptions_flags(QtLibraryInfo OFF)
# Add QMAKE_VERSION_STR only if qmake is part of the build.
if(QT_FEATURE_qmake)
target_compile_definitions(QtLibraryInfo PUBLIC
QMAKE_VERSION_STR="3.1"
)
endif()
endif() endif()
target_compile_definitions(QtLibraryInfo PUBLIC
PROEVALUATOR_FULL
QT_BUILD_QMAKE
QT_USE_QSTRINGBUILDER
QT_HOST_MKSPEC="${QT_QMAKE_HOST_MKSPEC}"
QT_TARGET_MKSPEC="${QT_QMAKE_TARGET_MKSPEC}"
QT_HOST_DATADIR="${hostdatadir}"
)
qt_internal_set_exceptions_flags(QtLibraryInfo OFF)
if(NOT QT_FEATURE_qmake) if(NOT QT_FEATURE_qmake)
return() return()
endif() endif()
@ -118,11 +127,6 @@ qt_internal_add_docs(qmake
qt_internal_return_unless_building_tools() qt_internal_return_unless_building_tools()
# Add QMAKE_VERSION_STR only if qmake is part of the build.
target_compile_definitions(QtLibraryInfo PUBLIC
QMAKE_VERSION_STR="3.1"
)
#### Keys ignored in scope 1:.:.:qmake.pro:<TRUE>: #### Keys ignored in scope 1:.:.:qmake.pro:<TRUE>:
# _OPTION = "host_build" # _OPTION = "host_build"