diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-09 14:09:06 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-09 15:51:40 +0200 |
| commit | 0f19f571ee307dbe5fdebeb489d0c6cfcc8fa5ef (patch) | |
| tree | 838ebcbebc0429dfeba724a1b052e577f5908b06 /tools/qmljs | |
| parent | 360a22838a9f6127702c35d9feb67560692df128 (diff) | |
CMake: Regenerate projects
We need the qt_add_tool changes to successfully configure qemu builds.
The rest of the changes are just to be in sync with the .pro files.
Change-Id: I7bcc08ac58f57a5761aedef09761428c55235289
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tools/qmljs')
| -rw-r--r-- | tools/qmljs/.prev_CMakeLists.txt | 19 | ||||
| -rw-r--r-- | tools/qmljs/CMakeLists.txt | 19 |
2 files changed, 20 insertions, 18 deletions
diff --git a/tools/qmljs/.prev_CMakeLists.txt b/tools/qmljs/.prev_CMakeLists.txt index 3bbec9b02a..621f54a18b 100644 --- a/tools/qmljs/.prev_CMakeLists.txt +++ b/tools/qmljs/.prev_CMakeLists.txt @@ -4,7 +4,8 @@ ## qmljs Tool: ##################################################################### -qt_add_tool(qmljs +qt_get_tool_target_name(target_name qmljs) +qt_add_tool(${target_name} TARGET_DESCRIPTION "QML JavaScript Tool" SOURCES qmljs.cpp @@ -44,42 +45,42 @@ qt_add_tool(qmljs ## Scopes: ##################################################################### -qt_extend_target(qmljs CONDITION WIN32 +qt_extend_target(${target_name} CONDITION WIN32 DEFINES NOMINMAX ) -qt_extend_target(qmljs CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) +qt_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(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler +qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler DEFINES WTF_USE_ARMV7_DISASSEMBLER=1 ) -qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler +qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler DEFINES WTF_USE_ARM64_DISASSEMBLER=1 ) -qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler +qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler DEFINES WTF_USE_MIPS32_DISASSEMBLER=1 ) -qt_extend_target(qmljs CONDITION NOT disassembler +qt_extend_target(${target_name} CONDITION NOT disassembler DEFINES WTF_USE_UDIS86=0 ) -qt_extend_target(qmljs CONDITION CMAKE_BUILD_TYPE STREQUAL Release +qt_extend_target(${target_name} CONDITION CMAKE_BUILD_TYPE STREQUAL Release DEFINES NDEBUG ) -qt_extend_target(qmljs CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC +qt_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 257f5fdb6e..e4e2cf1b7a 100644 --- a/tools/qmljs/CMakeLists.txt +++ b/tools/qmljs/CMakeLists.txt @@ -4,7 +4,8 @@ ## qmljs Tool: ##################################################################### -qt_add_tool(qmljs +qt_get_tool_target_name(target_name qmljs) +qt_add_tool(${target_name} TARGET_DESCRIPTION "QML JavaScript Tool" TOOLS_TARGET Qml # special case SOURCES @@ -45,42 +46,42 @@ qt_add_tool(qmljs ## Scopes: ##################################################################### -qt_extend_target(qmljs CONDITION WIN32 +qt_extend_target(${target_name} CONDITION WIN32 DEFINES NOMINMAX ) -qt_extend_target(qmljs CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) +qt_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(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler +qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler DEFINES WTF_USE_ARMV7_DISASSEMBLER=1 ) -qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler +qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler DEFINES WTF_USE_ARM64_DISASSEMBLER=1 ) -qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler +qt_extend_target(${target_name} CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler DEFINES WTF_USE_MIPS32_DISASSEMBLER=1 ) -qt_extend_target(qmljs CONDITION NOT disassembler +qt_extend_target(${target_name} CONDITION NOT disassembler DEFINES WTF_USE_UDIS86=0 ) -qt_extend_target(qmljs CONDITION CMAKE_BUILD_TYPE STREQUAL Release +qt_extend_target(${target_name} CONDITION CMAKE_BUILD_TYPE STREQUAL Release DEFINES NDEBUG ) -qt_extend_target(qmljs CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC +qt_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 ) |