diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-22 15:23:08 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-06 13:19:37 +0200 |
commit | 08adbefa131ef1c934f55cd61716c8ea836ddf02 (patch) | |
tree | 0ae21548926596fb41e7e71c4bb14d1973245bde /tools | |
parent | c52a857c2b6b89abeddeee8489110ab9dd363e53 (diff) |
CMake: Regenerate projects to use new qt_internal_ API
Modify special case locations to use the new API as well.
Task-number: QTBUG-86815
Change-Id: I3b964e3baf0cc7040830156dac30358ea1152801
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'tools')
24 files changed, 56 insertions, 56 deletions
diff --git a/tools/qml/.prev_CMakeLists.txt b/tools/qml/.prev_CMakeLists.txt index 52f1082f02..7a278d970e 100644 --- a/tools/qml/.prev_CMakeLists.txt +++ b/tools/qml/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qml) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Runtime" SOURCES conf.h @@ -24,7 +24,7 @@ set(qml_resource_files "resources/qml-64.png" ) -qt_add_resource(${target_name} "qml" +qt_internal_add_resource(${target_name} "qml" PREFIX "/qt-project.org/QmlRuntime" FILES @@ -41,12 +41,12 @@ qt_add_resource(${target_name} "qml" ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION TARGET Qt::Gui +qt_internal_extend_target(${target_name} CONDITION TARGET Qt::Gui PUBLIC_LIBRARIES Qt::Gui ) -qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets +qt_internal_extend_target(${target_name} CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) @@ -59,7 +59,7 @@ qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets # OTHER_FILES = "resources/Info.plist" # QMAKE_INFO_PLIST = "resources/Info.plist" -qt_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug +qt_internal_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug DEFINES QT_QML_DEBUG_NO_WARNING ) diff --git a/tools/qml/CMakeLists.txt b/tools/qml/CMakeLists.txt index a069731aac..7c545ecb75 100644 --- a/tools/qml/CMakeLists.txt +++ b/tools/qml/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qml) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Runtime" TOOLS_TARGET Qml # special case SOURCES @@ -41,7 +41,7 @@ set(qml_resource_files "resources/qml-64.png" ) -qt_add_resource(${target_name} "qml" +qt_internal_add_resource(${target_name} "qml" PREFIX "/qt-project.org/QmlRuntime" FILES @@ -58,12 +58,12 @@ qt_add_resource(${target_name} "qml" ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION TARGET Qt::Gui +qt_internal_extend_target(${target_name} CONDITION TARGET Qt::Gui PUBLIC_LIBRARIES Qt::Gui ) -qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets +qt_internal_extend_target(${target_name} CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) @@ -76,7 +76,7 @@ qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets # OTHER_FILES = "resources/Info.plist" # QMAKE_INFO_PLIST = "resources/Info.plist" -qt_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug +qt_internal_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug DEFINES QT_QML_DEBUG_NO_WARNING ) diff --git a/tools/qmlcachegen/.prev_CMakeLists.txt b/tools/qmlcachegen/.prev_CMakeLists.txt index 06b03d8e96..78e63898ac 100644 --- a/tools/qmlcachegen/.prev_CMakeLists.txt +++ b/tools/qmlcachegen/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlcachegen) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Cache Generator" SOURCES generateloader.cpp diff --git a/tools/qmlcachegen/CMakeLists.txt b/tools/qmlcachegen/CMakeLists.txt index a509166dee..9903406fab 100644 --- a/tools/qmlcachegen/CMakeLists.txt +++ b/tools/qmlcachegen/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlcachegen) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Cache Generator" TOOLS_TARGET Qml # special case SOURCES diff --git a/tools/qmleasing/CMakeLists.txt b/tools/qmleasing/CMakeLists.txt index e93995326b..7257b7cf6e 100644 --- a/tools/qmleasing/CMakeLists.txt +++ b/tools/qmleasing/CMakeLists.txt @@ -28,7 +28,7 @@ set(resources_resource_files "preview.qml" ) -qt_add_resource(qmleasing "resources" +qt_internal_add_resource(qmleasing "resources" PREFIX "/" FILES diff --git a/tools/qmlformat/.prev_CMakeLists.txt b/tools/qmlformat/.prev_CMakeLists.txt index e99eca96e1..618e1bbfaa 100644 --- a/tools/qmlformat/.prev_CMakeLists.txt +++ b/tools/qmlformat/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlformat) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Formatter" SOURCES commentastvisitor.cpp commentastvisitor.h diff --git a/tools/qmlformat/CMakeLists.txt b/tools/qmlformat/CMakeLists.txt index 73d106a1c1..e492a3ec56 100644 --- a/tools/qmlformat/CMakeLists.txt +++ b/tools/qmlformat/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlformat) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Formatter" TOOLS_TARGET Qml # special case SOURCES diff --git a/tools/qmlimportscanner/.prev_CMakeLists.txt b/tools/qmlimportscanner/.prev_CMakeLists.txt index 4be5ad8f06..7d56f6b75a 100644 --- a/tools/qmlimportscanner/.prev_CMakeLists.txt +++ b/tools/qmlimportscanner/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlimportscanner) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Import Scanner" SOURCES main.cpp diff --git a/tools/qmlimportscanner/CMakeLists.txt b/tools/qmlimportscanner/CMakeLists.txt index 8bb3dd9908..61e927b6fe 100644 --- a/tools/qmlimportscanner/CMakeLists.txt +++ b/tools/qmlimportscanner/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlimportscanner) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Import Scanner" TOOLS_TARGET Qml # special case SOURCES diff --git a/tools/qmljs/.prev_CMakeLists.txt b/tools/qmljs/.prev_CMakeLists.txt index 621f54a18b..86d0a31552 100644 --- a/tools/qmljs/.prev_CMakeLists.txt +++ b/tools/qmljs/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmljs) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML JavaScript Tool" SOURCES qmljs.cpp @@ -45,42 +45,42 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION WIN32 +qt_internal_extend_target(${target_name} CONDITION WIN32 DEFINES NOMINMAX ) -qt_extend_target(${target_name} CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) +qt_internal_extend_target(${target_name} CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) DEFINES WTF_USE_UDIS86=1 ) -qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler +qt_internal_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler DEFINES WTF_USE_ARMV7_DISASSEMBLER=1 ) -qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler +qt_internal_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler DEFINES WTF_USE_ARM64_DISASSEMBLER=1 ) -qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler +qt_internal_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler DEFINES WTF_USE_MIPS32_DISASSEMBLER=1 ) -qt_extend_target(${target_name} CONDITION NOT disassembler +qt_internal_extend_target(${target_name} CONDITION NOT disassembler DEFINES WTF_USE_UDIS86=0 ) -qt_extend_target(${target_name} CONDITION CMAKE_BUILD_TYPE STREQUAL Release +qt_internal_extend_target(${target_name} CONDITION CMAKE_BUILD_TYPE STREQUAL Release DEFINES NDEBUG ) -qt_extend_target(${target_name} CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC +qt_internal_extend_target(${target_name} CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC COMPILE_OPTIONS -Wno-expansion-to-defined ) diff --git a/tools/qmljs/CMakeLists.txt b/tools/qmljs/CMakeLists.txt index e4e2cf1b7a..147ddf008c 100644 --- a/tools/qmljs/CMakeLists.txt +++ b/tools/qmljs/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmljs) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML JavaScript Tool" TOOLS_TARGET Qml # special case SOURCES @@ -46,42 +46,42 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION WIN32 +qt_internal_extend_target(${target_name} CONDITION WIN32 DEFINES NOMINMAX ) -qt_extend_target(${target_name} CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) +qt_internal_extend_target(${target_name} CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) DEFINES WTF_USE_UDIS86=1 ) -qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler +qt_internal_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler DEFINES WTF_USE_ARMV7_DISASSEMBLER=1 ) -qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler +qt_internal_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler DEFINES WTF_USE_ARM64_DISASSEMBLER=1 ) -qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler +qt_internal_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler DEFINES WTF_USE_MIPS32_DISASSEMBLER=1 ) -qt_extend_target(${target_name} CONDITION NOT disassembler +qt_internal_extend_target(${target_name} CONDITION NOT disassembler DEFINES WTF_USE_UDIS86=0 ) -qt_extend_target(${target_name} CONDITION CMAKE_BUILD_TYPE STREQUAL Release +qt_internal_extend_target(${target_name} CONDITION CMAKE_BUILD_TYPE STREQUAL Release DEFINES NDEBUG ) -qt_extend_target(${target_name} CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC +qt_internal_extend_target(${target_name} CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC COMPILE_OPTIONS -Wno-expansion-to-defined ) diff --git a/tools/qmllint/.prev_CMakeLists.txt b/tools/qmllint/.prev_CMakeLists.txt index 923371c587..3b5a152f4b 100644 --- a/tools/qmllint/.prev_CMakeLists.txt +++ b/tools/qmllint/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmllint) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Syntax Verifier" SOURCES checkidentifiers.cpp checkidentifiers.h diff --git a/tools/qmllint/CMakeLists.txt b/tools/qmllint/CMakeLists.txt index 9230d8117b..a133af3cb7 100644 --- a/tools/qmllint/CMakeLists.txt +++ b/tools/qmllint/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmllint) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Syntax Verifier" TOOLS_TARGET Qml # special case SOURCES diff --git a/tools/qmlplugindump/.prev_CMakeLists.txt b/tools/qmlplugindump/.prev_CMakeLists.txt index 997f0ca446..c4747ea3ab 100644 --- a/tools/qmlplugindump/.prev_CMakeLists.txt +++ b/tools/qmlplugindump/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlplugindump) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Plugin Metadata Dumper" SOURCES ../../src/qmlcompiler/qqmljsstreamwriter.cpp ../../src/qmlcompiler/qqmljsstreamwriter_p.h @@ -28,12 +28,12 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets +qt_internal_extend_target(${target_name} CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(${target_name} CONDITION MACOS +qt_internal_extend_target(${target_name} CONDITION MACOS LINK_OPTIONS "-Wl,-sectcreate,__TEXT,__info_plist,$$shell_quote$$PWD/Info.plist" ) diff --git a/tools/qmlplugindump/CMakeLists.txt b/tools/qmlplugindump/CMakeLists.txt index 111f7dda24..c36d743611 100644 --- a/tools/qmlplugindump/CMakeLists.txt +++ b/tools/qmlplugindump/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlplugindump) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Plugin Metadata Dumper" TOOLS_TARGET Qml # special case SOURCES @@ -29,12 +29,12 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets +qt_internal_extend_target(${target_name} CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(${target_name} CONDITION MACOS +qt_internal_extend_target(${target_name} CONDITION MACOS LINK_OPTIONS "-Wl,-sectcreate,__TEXT,__info_plist,${CMAKE_CURRENT_SOURCE_DIR}/Info.plist" # special case ) diff --git a/tools/qmlpreview/.prev_CMakeLists.txt b/tools/qmlpreview/.prev_CMakeLists.txt index e8cfaa528a..61efd03729 100644 --- a/tools/qmlpreview/.prev_CMakeLists.txt +++ b/tools/qmlpreview/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlpreview) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Preview" SOURCES main.cpp diff --git a/tools/qmlpreview/CMakeLists.txt b/tools/qmlpreview/CMakeLists.txt index 3df5a921cf..4c347a404e 100644 --- a/tools/qmlpreview/CMakeLists.txt +++ b/tools/qmlpreview/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlpreview) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Preview" TOOLS_TARGET Qml # special case SOURCES diff --git a/tools/qmlprofiler/.prev_CMakeLists.txt b/tools/qmlprofiler/.prev_CMakeLists.txt index 27121615bd..51418f62dc 100644 --- a/tools/qmlprofiler/.prev_CMakeLists.txt +++ b/tools/qmlprofiler/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlprofiler) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Profiler" SOURCES commandlistener.cpp commandlistener.h diff --git a/tools/qmlprofiler/CMakeLists.txt b/tools/qmlprofiler/CMakeLists.txt index 77943aa397..c2e5c111ae 100644 --- a/tools/qmlprofiler/CMakeLists.txt +++ b/tools/qmlprofiler/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlprofiler) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Profiler" TOOLS_TARGET Qml # special case SOURCES diff --git a/tools/qmlscene/.prev_CMakeLists.txt b/tools/qmlscene/.prev_CMakeLists.txt index c1f7a78dd3..5c29546d60 100644 --- a/tools/qmlscene/.prev_CMakeLists.txt +++ b/tools/qmlscene/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlscene) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Scene Viewer" SOURCES main.cpp @@ -26,12 +26,12 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets +qt_internal_extend_target(${target_name} CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug +qt_internal_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug DEFINES QT_QML_DEBUG_NO_WARNING ) diff --git a/tools/qmlscene/CMakeLists.txt b/tools/qmlscene/CMakeLists.txt index 7e385653c1..4566a60441 100644 --- a/tools/qmlscene/CMakeLists.txt +++ b/tools/qmlscene/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmlscene) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Scene Viewer" TOOLS_TARGET Qml # special case SOURCES @@ -27,12 +27,12 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION TARGET Qt::Widgets +qt_internal_extend_target(${target_name} CONDITION TARGET Qt::Widgets PUBLIC_LIBRARIES Qt::Widgets ) -qt_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug +qt_internal_extend_target(${target_name} CONDITION QT_FEATURE_qml_debug DEFINES QT_QML_DEBUG_NO_WARNING ) diff --git a/tools/qmltestrunner/.prev_CMakeLists.txt b/tools/qmltestrunner/.prev_CMakeLists.txt index 4744ad5c80..9d55cb5075 100644 --- a/tools/qmltestrunner/.prev_CMakeLists.txt +++ b/tools/qmltestrunner/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmltestrunner) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Test Runner" SOURCES main.cpp diff --git a/tools/qmltestrunner/CMakeLists.txt b/tools/qmltestrunner/CMakeLists.txt index 370c1054a6..ebdec60bb5 100644 --- a/tools/qmltestrunner/CMakeLists.txt +++ b/tools/qmltestrunner/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qmltestrunner) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "QML Test Runner" TOOLS_TARGET Qml # special case SOURCES diff --git a/tools/qmltime/CMakeLists.txt b/tools/qmltime/CMakeLists.txt index 40161d1c1a..95794e8135 100644 --- a/tools/qmltime/CMakeLists.txt +++ b/tools/qmltime/CMakeLists.txt @@ -4,7 +4,7 @@ ## qmltime Binary: ##################################################################### -qt_add_executable(qmltime +qt_internal_add_executable(qmltime GUI SOURCES qmltime.cpp qmltime.h |