diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-14 13:31:06 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-15 12:24:51 +0000 |
| commit | ba494aaa24defe1401f621b791891e696b308756 (patch) | |
| tree | 3617f29e9625fafbf94609ac79b2decd4033107c /tools/qmljs | |
| parent | 91e32f86b53bb930405a58e19c84746ee85cdf89 (diff) | |
Regenerate all projects with new CMake API version
Change-Id: Ie0db35f674137c229eaf049616f38f8e818f7092
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tools/qmljs')
| -rw-r--r-- | tools/qmljs/.prev_CMakeLists.txt | 18 | ||||
| -rw-r--r-- | tools/qmljs/CMakeLists.txt | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/tools/qmljs/.prev_CMakeLists.txt b/tools/qmljs/.prev_CMakeLists.txt index 2c3b500e03..0f845fa3ed 100644 --- a/tools/qmljs/.prev_CMakeLists.txt +++ b/tools/qmljs/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qmljs Tool: ##################################################################### -add_qt_tool(qmljs +qt_add_tool(qmljs SOURCES qmljs.cpp DEFINES @@ -45,42 +45,42 @@ add_qt_tool(qmljs ## Scopes: ##################################################################### -extend_target(qmljs CONDITION WIN32 +qt_extend_target(qmljs CONDITION WIN32 DEFINES NOMINMAX ) -extend_target(qmljs CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) +qt_extend_target(qmljs CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) DEFINES WTF_USE_UDIS86=1 ) -extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler +qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler DEFINES WTF_USE_ARMV7_DISASSEMBLER=1 ) -extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler +qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler DEFINES WTF_USE_ARM64_DISASSEMBLER=1 ) -extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler +qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler DEFINES WTF_USE_MIPS32_DISASSEMBLER=1 ) -extend_target(qmljs CONDITION NOT disassembler +qt_extend_target(qmljs CONDITION NOT disassembler DEFINES WTF_USE_UDIS86=0 ) -extend_target(qmljs CONDITION CMAKE_BUILD_TYPE STREQUAL Release +qt_extend_target(qmljs CONDITION CMAKE_BUILD_TYPE STREQUAL Release DEFINES NDEBUG ) -extend_target(qmljs CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC +qt_extend_target(qmljs 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 300a9ac47a..4655bfb9fc 100644 --- a/tools/qmljs/CMakeLists.txt +++ b/tools/qmljs/CMakeLists.txt @@ -4,7 +4,7 @@ ## qmljs Tool: ##################################################################### -add_qt_tool(qmljs +qt_add_tool(qmljs TOOLS_TARGET Qml # special case SOURCES qmljs.cpp @@ -46,42 +46,42 @@ add_qt_tool(qmljs ## Scopes: ##################################################################### -extend_target(qmljs CONDITION WIN32 +qt_extend_target(qmljs CONDITION WIN32 DEFINES NOMINMAX ) -extend_target(qmljs CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) +qt_extend_target(qmljs CONDITION disassembler AND ((TEST_architecture_arch STREQUAL "i386") OR (TEST_architecture_arch STREQUAL "x86_64")) DEFINES WTF_USE_UDIS86=1 ) -extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler +qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm") AND disassembler DEFINES WTF_USE_ARMV7_DISASSEMBLER=1 ) -extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler +qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "arm64") AND disassembler DEFINES WTF_USE_ARM64_DISASSEMBLER=1 ) -extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler +qt_extend_target(qmljs CONDITION (TEST_architecture_arch STREQUAL "mips") AND disassembler DEFINES WTF_USE_MIPS32_DISASSEMBLER=1 ) -extend_target(qmljs CONDITION NOT disassembler +qt_extend_target(qmljs CONDITION NOT disassembler DEFINES WTF_USE_UDIS86=0 ) -extend_target(qmljs CONDITION CMAKE_BUILD_TYPE STREQUAL Release +qt_extend_target(qmljs CONDITION CMAKE_BUILD_TYPE STREQUAL Release DEFINES NDEBUG ) -extend_target(qmljs CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC +qt_extend_target(qmljs CONDITION GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 6 AND NOT CLANG AND NOT ICC COMPILE_OPTIONS -Wno-expansion-to-defined ) |