diff options
Diffstat (limited to 'qmake/.prev_CMakeLists.txt')
| -rw-r--r-- | qmake/.prev_CMakeLists.txt | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/qmake/.prev_CMakeLists.txt b/qmake/.prev_CMakeLists.txt index 63b34a0970..2bfc56b37f 100644 --- a/qmake/.prev_CMakeLists.txt +++ b/qmake/.prev_CMakeLists.txt @@ -4,7 +4,8 @@ ## qmake Tool: ##################################################################### -qt_add_tool(qmake +qt_get_tool_target_name(target_name qmake) +qt_add_tool(${target_name} SOURCES ../src/3rdparty/pcre2/src/config.h ../src/3rdparty/pcre2/src/pcre2.h @@ -169,7 +170,7 @@ qt_add_tool(qmake ## Scopes: ##################################################################### -qt_extend_target(qmake CONDITION WIN32 +qt_extend_target(${target_name} CONDITION WIN32 SOURCES ../src/corelib/global/qoperatingsystemversion_win.cpp ../src/corelib/io/qfilesystemengine_win.cpp @@ -193,7 +194,7 @@ qt_extend_target(qmake CONDITION WIN32 ole32 ) -qt_extend_target(qmake CONDITION UNIX +qt_extend_target(${target_name} CONDITION UNIX SOURCES ../src/corelib/io/qfilesystemengine_unix.cpp ../src/corelib/io/qfilesystemiterator_unix.cpp @@ -202,7 +203,7 @@ qt_extend_target(qmake CONDITION UNIX ../src/corelib/text/qlocale_unix.cpp ) -qt_extend_target(qmake CONDITION MACOS +qt_extend_target(${target_name} CONDITION MACOS SOURCES qcore_foundation.mm qcore_mac.mm @@ -216,13 +217,16 @@ qt_extend_target(qmake CONDITION MACOS -fconstant-cfstrings ) -qt_extend_target(qmake CONDITION MINGW AND WIN32 +qt_extend_target(${target_name} CONDITION MINGW AND WIN32 PUBLIC_LIBRARIES uuid ) -qt_extend_target(qmake CONDITION CLANG AND WIN32 +qt_extend_target(${target_name} CONDITION CLANG AND WIN32 COMPILE_OPTIONS -Wno-microsoft-enum-value -fms-compatibility-version=19.00.23506 ) + +#### Keys ignored in scope 10:.:../src/3rdparty/pcre2:../src/3rdparty/pcre2/pcre2.pri:QT_FEATURE_intelcet: +# QMAKE_CFLAGS = "$$QMAKE_CFLAGS_SHSTK" |