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

Build test/manual if it contains a CMakeLists.txt

Browse Source 
Change-Id: Ibada60b0902f9c6a6a7284489a56106e0021a9de
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Leander Beernaert 2019-11-08 11:23:04 +01:00
parent 37ec5a0462
commit 2199a50a2a
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
View File

@ -183,6 +183,9 @@ macro(qt_build_tests)
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/CMakeLists.txt" AND QT_BUILD_BENCHMARKS) if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/CMakeLists.txt" AND QT_BUILD_BENCHMARKS)
add_subdirectory(benchmarks) add_subdirectory(benchmarks)
endif() endif()
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/manual/CMakeLists.txt")
add_subdirectory(manual)
endif()
endmacro() endmacro()
macro(qt_examples_build_begin) macro(qt_examples_build_begin)

6
tests/manual/CMakeLists.txt
View File

@ -1,5 +1,11 @@
# Generated from tests/manual/manual.pro. # Generated from tests/manual/manual.pro.
# special case begin
# Ignore this folder for now as we need to wait for changes in dev to make
# it back into wip/cmake regarding duplicate target names
return()
# special case end
add_subdirectory("bearerex") add_subdirectory("bearerex")
add_subdirectory("filetest") add_subdirectory("filetest")
add_subdirectory("embeddedintoforeignwindow") add_subdirectory("embeddedintoforeignwindow")