aboutsummaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorCristian Adam <cristian.adam@qt.io>2021-06-10 15:49:13 +0200
committerCristian Adam <cristian.adam@qt.io>2021-06-10 16:47:44 +0000
commit99396421de06f09f8532baad3303ec6dd0ee96fe (patch)
treecc15f137d189e40d0e1ad86b925b5b559124b044 /cmake
parent0bdafc56b0e0f96adb1983d6f6631b0771753894 (diff)
CMakePM: Filter test also by BUILD_EXECUTABLES list
This way one can build only one test. Change-Id: Iebf9686108988793193106ebed312f7e86ee2e61 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtCreatorAPI.cmake25
1 files changed, 10 insertions, 15 deletions
diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake
index 18f9120ded8..1625daf03be 100644
--- a/cmake/QtCreatorAPI.cmake
+++ b/cmake/QtCreatorAPI.cmake
@@ -799,31 +799,26 @@ function(add_qtc_test name)
endif()
endforeach()
- 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})
-
- extend_qtc_target(${name}
- DEPENDS ${_arg_DEPENDS} ${IMPLICIT_DEPENDS}
- INCLUDES "${CMAKE_BINARY_DIR}/src" ${_arg_INCLUDES}
- DEFINES ${_arg_DEFINES} ${TEST_DEFINES} ${default_defines_copy}
+ add_qtc_executable(${name}
+ SOURCES ${_arg_SOURCES}
+ DEPENDS ${_arg_DEPENDS}
+ INCLUDES ${_arg_INCLUDES}
+ DEFINES ${_arg_DEFINES}
EXPLICIT_MOC ${_arg_EXPLICIT_MOC}
SKIP_AUTOMOC ${_arg_SKIP_AUTOMOC}
+ ALLOW_ASCII_CASTS
)
+ if (NOT TARGET ${name})
+ return()
+ endif()
+
set_target_properties(${name} PROPERTIES
- CXX_VISIBILITY_PRESET hidden
- VISIBILITY_INLINES_HIDDEN ON
BUILD_RPATH "${_RPATH_BASE}/${_RPATH}"
INSTALL_RPATH "${_RPATH_BASE}/${_RPATH}"
)
- enable_pch(${name})
if (NOT _arg_GTEST)
add_test(NAME ${name} COMMAND ${name})