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

CMake Build: Fix unittests

Browse Source 
Change-Id: I4214954d880d19dbe9a070d031c417dc3caf068a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Cristian Adam
2020-06-09 12:07:59 +02:00
parent 3bd22bd2d7
commit be339abb16
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/QtCreatorAPI.cmake
View File

@@ -679,11 +679,14 @@ function(add_qtc_test name)
endif() endif()
endfunction() endfunction()
function(finalize_qtc_gtest test_name) function(finalize_qtc_gtest test_name exclude_sources_regex)
if (NOT TARGET ${test_name}) if (NOT TARGET ${test_name})
return() return()
endif() endif()
get_target_property(test_sources ${test_name} SOURCES) get_target_property(test_sources ${test_name} SOURCES)
if (exclude_sources_regex)
list(FILTER test_sources EXCLUDE REGEX "${exclude_sources_regex}")
endif()
include(GoogleTest) include(GoogleTest)
gtest_add_tests(TARGET ${test_name} SOURCES ${test_sources} TEST_LIST test_list) gtest_add_tests(TARGET ${test_name} SOURCES ${test_sources} TEST_LIST test_list)

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

@@ -20,7 +20,7 @@ add_qtc_test(unittest GTEST
Qt5::Xml Qt5::Concurrent Qt5::Qml Qt5::Gui Qt5::Xml Qt5::Concurrent Qt5::Qml Qt5::Gui
Googletest Googletest
clangrefactoringbackend_lib clangbackend_lib clangpchmanagerbackend_lib clangrefactoringbackend_lib clangbackend_lib clangpchmanagerbackend_lib
CPlusPlus Sqlite Utils CPlusPlus Utils
DEFINES DEFINES
UNIT_TESTS UNIT_TESTS
DONT_CHECK_MESSAGE_COUNTER DONT_CHECK_MESSAGE_COUNTER
@@ -174,6 +174,13 @@ add_qtc_test(unittest GTEST
sqlitevalue-test.cpp sqlitevalue-test.cpp
) )
extend_qtc_test(unittest
DEFINES
$<TARGET_PROPERTY:Sqlite,INTERFACE_COMPILE_DEFINITIONS>
SOURCES
../../../src/libs/3rdparty/sqlite/sqlite3.c
)
# Do not work on the source directory data # Do not work on the source directory data
add_custom_command(TARGET unittest POST_BUILD add_custom_command(TARGET unittest POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E copy_directory COMMAND "${CMAKE_COMMAND}" -E copy_directory
@@ -289,7 +296,7 @@ extend_qtc_test(unittest
smallstring-benchmark.cpp smallstring-benchmark.cpp
) )
finalize_qtc_gtest(unittest) finalize_qtc_gtest(unittest ".c$")
# Path needs to be before CppTools # Path needs to be before CppTools
target_include_directories(unittest target_include_directories(unittest