diff options
Diffstat (limited to 'qmake/CMakeLists.txt')
-rw-r--r-- | qmake/CMakeLists.txt | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index 3e81ef4820..ff50f507c5 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -4,7 +4,7 @@ ## qmake Binary: ##################################################################### -add_qt_tool(qmake # special case +qt_add_tool(qmake # special case NO_QT # special case TOOLS_TARGET Core # special case # GUI # special case: remove this @@ -37,8 +37,11 @@ add_qt_tool(qmake # special case ../src/corelib/kernel/qsystemerror.cpp ../src/corelib/kernel/qsystemerror_p.h ../src/corelib/kernel/qvariant.cpp ../src/corelib/plugin/quuid.cpp ../src/corelib/plugin/quuid.h - ../src/corelib/serialization/qjson.cpp ../src/corelib/serialization/qjson_p.h + ../src/corelib/serialization/qcborstreamwriter.cpp ../src/corelib/serialization/qcborstreamwriter.h + ../src/corelib/serialization/qcborvalue.cpp ../src/corelib/serialization/qcborvalue.h ../src/corelib/serialization/qcborvalue_p.h + ../src/corelib/serialization/qjson_p.h ../src/corelib/serialization/qjsonarray.cpp ../src/corelib/serialization/qjsonarray.h + ../src/corelib/serialization/qjsoncbor.cpp ../src/corelib/serialization/qjsondocument.cpp ../src/corelib/serialization/qjsondocument.h ../src/corelib/serialization/qjsonobject.cpp ../src/corelib/serialization/qjsonobject.h ../src/corelib/serialization/qjsonparser.cpp ../src/corelib/serialization/qjsonparser_p.h @@ -119,21 +122,19 @@ add_qt_tool(qmake # special case generators/unix generators/win32 library - $<TARGET_PROPERTY:Qt::CorePrivate,INTERFACE_INCLUDE_DIRECTORIES> # special case - ${CMAKE_BINARY_DIR}/src/corelib/global # special case: for qconfig.cpp + $<TARGET_PROPERTY:Qt::Core,INCLUDE_DIRECTORIES> # special case + "${PROJECT_BINARY_DIR}/src/corelib/global" # special case: for qconfig.cpp PRECOMPILED_HEADER "qmake_pch.h" ) -qt_internal_add_target_aliases(Bootstrap) # special case - #### Keys ignored in scope 1:.:.:qmake.pro:<TRUE>: # _OPTION = "host_build" ## Scopes: ##################################################################### -extend_target(qmake CONDITION WIN32 +qt_extend_target(qmake CONDITION WIN32 SOURCES ../src/corelib/global/qoperatingsystemversion_win.cpp ../src/corelib/io/qfilesystemengine_win.cpp @@ -155,7 +156,7 @@ extend_target(qmake CONDITION WIN32 ole32 ) -extend_target(qmake CONDITION UNIX +qt_extend_target(qmake CONDITION UNIX SOURCES ../src/corelib/io/qfilesystemengine_unix.cpp ../src/corelib/io/qfilesystemiterator_unix.cpp @@ -164,7 +165,7 @@ extend_target(qmake CONDITION UNIX ../src/corelib/text/qlocale_unix.cpp ) -extend_target(qmake CONDITION APPLE_OSX +qt_extend_target(qmake CONDITION APPLE_OSX SOURCES ../src/corelib/kernel/qcore_foundation.mm # special case ../src/corelib/kernel/qcore_mac.cpp # special case @@ -195,12 +196,12 @@ extend_target(qmake CONDITION WIN32 ole32 advapi32 kernel32 netapi32 ) -extend_target(qmake CONDITION WIN32 AND mingw +qt_extend_target(qmake CONDITION WIN32 AND mingw PUBLIC_LIBRARIES uuid ) -extend_target(qmake CONDITION CLANG AND WIN32 +qt_extend_target(qmake CONDITION CLANG AND WIN32 COMPILE_OPTIONS "-fms-compatibility-version=19.00.23506" "-Wno-microsoft-enum-value" |