diff options
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/.prev_CMakeLists.txt | 12 | ||||
| -rw-r--r-- | qmake/CMakeLists.txt | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/qmake/.prev_CMakeLists.txt b/qmake/.prev_CMakeLists.txt index aa265d4308..74a2750ff2 100644 --- a/qmake/.prev_CMakeLists.txt +++ b/qmake/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmake) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} SOURCES ../src/3rdparty/pcre2/src/config.h ../src/3rdparty/pcre2/src/pcre2.h @@ -172,7 +172,7 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION WIN32 +qt_internal_extend_target(${target_name} CONDITION WIN32 SOURCES ../src/corelib/global/qoperatingsystemversion_win.cpp ../src/corelib/io/qfilesystemengine_win.cpp @@ -196,7 +196,7 @@ qt_extend_target(${target_name} CONDITION WIN32 ole32 ) -qt_extend_target(${target_name} CONDITION UNIX +qt_internal_extend_target(${target_name} CONDITION UNIX SOURCES ../src/corelib/io/qfilesystemengine_unix.cpp ../src/corelib/io/qfilesystemiterator_unix.cpp @@ -205,7 +205,7 @@ qt_extend_target(${target_name} CONDITION UNIX ../src/corelib/text/qlocale_unix.cpp ) -qt_extend_target(${target_name} CONDITION MACOS +qt_internal_extend_target(${target_name} CONDITION MACOS SOURCES qcore_foundation.mm qcore_mac.mm @@ -219,12 +219,12 @@ qt_extend_target(${target_name} CONDITION MACOS -fconstant-cfstrings ) -qt_extend_target(${target_name} CONDITION MINGW AND WIN32 +qt_internal_extend_target(${target_name} CONDITION MINGW AND WIN32 PUBLIC_LIBRARIES uuid ) -qt_extend_target(${target_name} CONDITION CLANG AND WIN32 +qt_internal_extend_target(${target_name} 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 2f3eb78b79..65d847375e 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmake) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} NO_QT # special case TOOLS_TARGET Core # special case # GUI # special case: remove this @@ -191,7 +191,7 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION WIN32 +qt_internal_extend_target(${target_name} CONDITION WIN32 SOURCES ../src/corelib/global/qoperatingsystemversion_win.cpp ../src/corelib/io/qfilesystemengine_win.cpp @@ -215,7 +215,7 @@ qt_extend_target(${target_name} CONDITION WIN32 ole32 ) -qt_extend_target(${target_name} CONDITION UNIX +qt_internal_extend_target(${target_name} CONDITION UNIX SOURCES ../src/corelib/io/qfilesystemengine_unix.cpp ../src/corelib/io/qfilesystemiterator_unix.cpp @@ -224,7 +224,7 @@ qt_extend_target(${target_name} CONDITION UNIX ../src/corelib/text/qlocale_unix.cpp ) -qt_extend_target(${target_name} CONDITION MACOS +qt_internal_extend_target(${target_name} CONDITION MACOS SOURCES ../src/corelib/kernel/qcore_foundation.mm # special case ../src/corelib/kernel/qcore_mac.mm # special case @@ -239,7 +239,7 @@ qt_extend_target(${target_name} CONDITION MACOS ) # special case big -extend_target(qmake CONDITION WIN32 +qt_internal_extend_target(qmake CONDITION WIN32 SOURCES ../src/corelib/io/qfilesystemengine_win.cpp ../src/corelib/io/qfilesystemiterator_win.cpp @@ -255,12 +255,12 @@ extend_target(qmake CONDITION WIN32 ole32 advapi32 kernel32 netapi32 ) -qt_extend_target(${target_name} CONDITION MINGW AND WIN32 +qt_internal_extend_target(${target_name} CONDITION MINGW AND WIN32 PUBLIC_LIBRARIES uuid ) -qt_extend_target(${target_name} CONDITION CLANG AND WIN32 +qt_internal_extend_target(${target_name} CONDITION CLANG AND WIN32 COMPILE_OPTIONS "-fms-compatibility-version=19.00.23506" "-Wno-microsoft-enum-value" |