diff options
Diffstat (limited to 'qmake/.prev_CMakeLists.txt')
| -rw-r--r-- | qmake/.prev_CMakeLists.txt | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/qmake/.prev_CMakeLists.txt b/qmake/.prev_CMakeLists.txt index 5381bea434..3f30387fd4 100644 --- a/qmake/.prev_CMakeLists.txt +++ b/qmake/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qmake Binary: ##################################################################### -add_qt_executable(qmake +qt_add_executable(qmake SOURCES ../src/corelib/codecs/qutfcodec.cpp ../src/corelib/codecs/qutfcodec_p.h ../src/corelib/global/qglobal.cpp ../src/corelib/global/qglobal.h @@ -30,8 +30,11 @@ add_qt_executable(qmake ../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 @@ -110,6 +113,7 @@ add_qt_executable(qmake (..)/include/QtCore//QtCore (..)/src/corelib/global . + ../src/3rdparty/tinycbor/src generators generators/mac generators/unix @@ -127,7 +131,7 @@ add_qt_executable(qmake ## 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 @@ -149,7 +153,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 @@ -158,7 +162,7 @@ extend_target(qmake CONDITION UNIX qlocale_unix.cpp-NOTFOUND ) -extend_target(qmake CONDITION APPLE_OSX +qt_extend_target(qmake CONDITION APPLE_OSX SOURCES qcore_foundation.mm qcore_mac.cpp @@ -172,12 +176,12 @@ extend_target(qmake CONDITION APPLE_OSX -fconstant-cfstrings ) -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 -Wno-microsoft-enum-value -fms-compatibility-version=19.00.23506 |