1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: add corelib/thread/qthreadstorage

Browse Source 
Fixes: QTBUG-78221
Change-Id: Icb4614f8187c16e6b13d9db1dbc6adfcd579db43
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Frederik Gladhorn 2019-10-07 11:17:45 +02:00
parent fbace1f4e0
commit 06fdea1ce5
5 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/CMakeLists.txt
View File

@ -10,6 +10,7 @@ if(NOT TARGET Qt::Test)
# because a few tests link directly against those libraries.
qt_find_package(WrapDBus1 PROVIDED_TARGETS dbus-1)
qt_find_package(ICU COMPONENTS i18n uc data PROVIDED_TARGETS ICU::i18n ICU::uc ICU::data)
qt_find_package(Threads PROVIDED_TARGETS Threads::Threads)
endif()
# special case end

2
tests/auto/corelib/thread/CMakeLists.txt
View File

@ -15,7 +15,7 @@ if(QT_FEATURE_thread)
add_subdirectory(qthread)
add_subdirectory(qthreadonce)
add_subdirectory(qthreadpool)
# add_subdirectory(qthreadstorage) ### FIXME
add_subdirectory(qthreadstorage)
add_subdirectory(qwaitcondition)
add_subdirectory(qwritelocker)
endif()

2
tests/auto/corelib/thread/qthread/CMakeLists.txt
View File

@ -4,8 +4,6 @@
## tst_qthread Test:
#####################################################################
qt_find_package(Threads PROVIDED_TARGETS Threads::Threads) # special case
add_qt_test(tst_qthread
SOURCES
../../../../shared/emulationdetector.h

21
tests/auto/corelib/thread/qthreadstorage/CMakeLists.txt Normal file
View File

@ -0,0 +1,21 @@
# special case skip regeneration
# Generated from qthreadstorage.pro.
#####################################################################
## tst_qthreadstorage Test:
#####################################################################
add_qt_test(tst_qthreadstorage
SOURCES
tst_qthreadstorage.cpp
LIBRARIES # special case
Threads::Threads # special case
)
## Scopes:
#####################################################################
if(NOT ANDROID AND NOT WINRT)
add_subdirectory(crashonexit)
endif()

15
tests/auto/corelib/thread/qthreadstorage/crashonexit/CMakeLists.txt Normal file
View File

@ -0,0 +1,15 @@
# Generated from crashonexit.pro.
#####################################################################
## crashonexit Binary:
#####################################################################
add_qt_executable(crashOnExit_helper
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.." # special case
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashOnExit_helper" # special case
SOURCES
crashOnExit.cpp
)
## Scopes:
#####################################################################