diff options
Diffstat (limited to 'qmake/CMakeLists.txt')
| -rw-r--r-- | qmake/CMakeLists.txt | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index 2c2c777b2c..78e85c7696 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -15,6 +15,10 @@ qt_add_library(QtLibraryInfo OBJECT propertyprinter.cpp propertyprinter.h qmakelibraryinfo.cpp qmakelibraryinfo.h ) +qt_internal_add_sbom(QtLibraryInfo + TYPE QT_MODULE + NO_INSTALL +) # Make sure we use same parameters when building QtLibraryInfo and other Qt libraries, # otherwise some compilers may have compilation errors, such as clang-cl. @@ -52,9 +56,9 @@ endif() qt_get_tool_target_name(target_name qmake) qt_internal_add_tool(${target_name} + TRY_RUN TOOLS_TARGET Core USER_FACING - NO_UNITY_BUILD INSTALL_VERSIONED_LINK SOURCES cachekeys.h @@ -95,6 +99,9 @@ qt_internal_add_tool(${target_name} "qmake_pch.h" LIBRARIES QtLibraryInfo + NO_UNITY_BUILD_SOURCES + generators/win32/msvc_objectmodel.cpp # xml symbols clash with generators/win32/msbuild_objectmodel.cpp + library/qmakeparser.cpp # struct statics clashes with qmakeevaluator_p.h ) qt_internal_return_unless_building_tools() @@ -121,12 +128,6 @@ qt_internal_extend_target(${target_name} CONDITION WIN32 _SCL_SECURE_NO_WARNINGS ) -qt_internal_extend_target(${target_name} CONDITION CLANG AND WIN32 - COMPILE_OPTIONS - "-fms-compatibility-version=19.00.23506" - "-Wno-microsoft-enum-value" -) - set_target_properties(${target_name} PROPERTIES AUTOMOC OFF AUTORCC OFF |