From e9a58ba9e55467f8c69e19dd52c2afa7cbb39529 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 13 Nov 2019 15:00:38 +0100 Subject: Regenerate src/* Change-Id: I0314b4faa1e4860e86198eea4189987e527dfec2 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- qmake/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'qmake/CMakeLists.txt') 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" -- cgit v1.2.3