feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Revert "CMakePM: Filter test also by BUILD_EXECUTABLES list"

Browse Source 
This reverts commit 99396421de.

The patch does not solve the use case (building Qt Creator without
tests and then only building individual tests), and has lots of
side effects like tests landing in the application bundle on macOS
and in bin on Windows, and tests being installed.

Change-Id: I593627b55577e13a3d2cf1758deac99efa521954
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Eike Ziller
2021-06-11 13:42:49 +02:00
parent c8241c12d0
commit dcfc467959
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
cmake/QtCreatorAPI.cmake
View File

@@ -799,26 +799,31 @@ function(add_qtc_test name)
endif() endif()
endforeach() 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}") file(RELATIVE_PATH _RPATH "/${IDE_BIN_PATH}" "/${IDE_LIBRARY_PATH}")
add_qtc_executable(${name} add_executable(${name} ${_arg_SOURCES})
SOURCES ${_arg_SOURCES}
DEPENDS ${_arg_DEPENDS} extend_qtc_target(${name}
INCLUDES ${_arg_INCLUDES} DEPENDS ${_arg_DEPENDS} ${IMPLICIT_DEPENDS}
DEFINES ${_arg_DEFINES} INCLUDES "${CMAKE_BINARY_DIR}/src" ${_arg_INCLUDES}
DEFINES ${_arg_DEFINES} ${TEST_DEFINES} ${default_defines_copy}
EXPLICIT_MOC ${_arg_EXPLICIT_MOC} EXPLICIT_MOC ${_arg_EXPLICIT_MOC}
SKIP_AUTOMOC ${_arg_SKIP_AUTOMOC} SKIP_AUTOMOC ${_arg_SKIP_AUTOMOC}
ALLOW_ASCII_CASTS
) )
if (NOT TARGET ${name})
return()
endif()
set_target_properties(${name} PROPERTIES set_target_properties(${name} PROPERTIES
CXX_VISIBILITY_PRESET hidden
VISIBILITY_INLINES_HIDDEN ON
BUILD_RPATH "${_RPATH_BASE}/${_RPATH}" BUILD_RPATH "${_RPATH_BASE}/${_RPATH}"
INSTALL_RPATH "${_RPATH_BASE}/${_RPATH}" INSTALL_RPATH "${_RPATH_BASE}/${_RPATH}"
) )
enable_pch(${name})
if (NOT _arg_GTEST) if (NOT _arg_GTEST)
add_test(NAME ${name} COMMAND ${name}) add_test(NAME ${name} COMMAND ${name})

4
tests/unit/unittest/CMakeLists.txt
View File

@@ -194,10 +194,6 @@ add_qtc_test(unittest GTEST
mockimagecachestorage.h mockimagecachestorage.h
) )
if (NOT TARGET unittest)
return()
endif()
function(extend_qtc_test_with_target_sources target) function(extend_qtc_test_with_target_sources target)
cmake_parse_arguments(_arg "" "" "DEFINES;INCLUDES" ${ARGN}) cmake_parse_arguments(_arg "" "" "DEFINES;INCLUDES" ${ARGN})