diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-13 15:00:38 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-14 09:05:48 +0000 |
| commit | e9a58ba9e55467f8c69e19dd52c2afa7cbb39529 (patch) | |
| tree | 0d9d92641192c7bc7ca7c6d451d7d123d80ea6bb /qmake | |
| parent | 38354d7d6132344a322751c91202109d847771b9 (diff) | |
Regenerate src/*
Change-Id: I0314b4faa1e4860e86198eea4189987e527dfec2
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/.prev_CMakeLists.txt | 12 | ||||
| -rw-r--r-- | qmake/CMakeLists.txt | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/qmake/.prev_CMakeLists.txt b/qmake/.prev_CMakeLists.txt index 5381bea434..d914f1cd85 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 @@ -127,7 +127,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 +149,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 +158,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 +172,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 diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index 3e81ef4820..85a0d41171 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 @@ -133,7 +133,7 @@ qt_internal_add_target_aliases(Bootstrap) # special case ## 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 +155,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 +164,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 +195,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" |