diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-06-11 16:25:51 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-06-12 14:30:08 +0000 |
| commit | e2670bf3e62d9a4a1aea5029b600fc292dfd1e5b (patch) | |
| tree | e941c7def0d5f7bd3a98954b1381075a3af7ea06 /cmake | |
| parent | 507019ef93bc720539852d3a3dcd932911e789f0 (diff) | |
CMake build: Build tests with relaxed QString casting
Like in the qmake build.
Change-Id: I216649123b4f25e5c01f2a71162fc200e0a36d85
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtCreatorAPI.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index 1c5dbbcece..1e1c362ad5 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -655,6 +655,11 @@ function(add_qtc_test name) update_cached_list(__QTC_TESTS "${name}") set(TEST_DEFINES SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}") + + # relax cast requirements for tests + set(default_defines_copy ${DEFAULT_DEFINES}) + list(REMOVE_ITEM default_defines_copy QT_NO_CAST_TO_ASCII QT_RESTRICTED_CAST_FROM_ASCII) + file(RELATIVE_PATH _RPATH "/${IDE_BIN_PATH}" "/${IDE_LIBRARY_PATH}") add_executable(${name} ${_arg_SOURCES}) @@ -662,7 +667,7 @@ function(add_qtc_test name) extend_qtc_target(${name} DEPENDS ${_arg_DEPENDS} ${IMPLICIT_DEPENDS} INCLUDES "${CMAKE_BINARY_DIR}/src" ${_arg_INCLUDES} - DEFINES ${_arg_DEFINES} ${TEST_DEFINES} ${DEFAULT_DEFINES} + DEFINES ${_arg_DEFINES} ${TEST_DEFINES} ${default_defines_copy} EXPLICIT_MOC ${_arg_EXPLICIT_MOC} SKIP_AUTOMOC ${_arg_SKIP_AUTOMOC} ) |