diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-06-06 13:08:41 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-06-06 12:27:41 +0000 |
| commit | 053766d7968296b171aea1410a0e00184309185c (patch) | |
| tree | c05677910c0e98b46bc1a2632dc25ea4f29f4882 /examples/CMakeLists.txt | |
| parent | ac16a1228c0d16012658a97f9de4825b5a2ae97f (diff) | |
| download | qtbase-053766d7968296b171aea1410a0e00184309185c.tar.gz | |
Fix Standalone Example build when crosscompiling
Added qt_examples_begin() and qt_examples_end() macros to setup the
example list so it can be re-used in other projects.
When cross-compiling, we also need to set
CMAKE_FIND_ROOT_PATH_MODE_PACKAGE to BOTH in order for find_package()
to work correctly.
Removed support for building the whole qtbase/examples folder as a
standalone project. Building examples is only supported when building
the whole of qtbase (qtbase + examples together) or each individual
example is built separately against an installed Qt version.
Change-Id: I9d26b94b48b95af230b76ab618becb21d2d45581
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'examples/CMakeLists.txt')
| -rw-r--r-- | examples/CMakeLists.txt | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 5f61a098bd..c9abbd8ec9 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,21 +1,6 @@ # special case begin -cmake_minimum_required(VERSION 3.14.0) +qt_examples_build_begin() -project(QtBaseExamples LANGUAGES CXX C ASM) - -# Check whether this project is built as part of a Qt build -if (CMAKE_PROJECT_NAME STREQUAL "QtBaseExamples") - set(QT_STANDALONE_EXAMPLES_BUILD TRUE) -endif() - -if (NOT QT_STANDALONE_EXAMPLES_BUILD) - # It is part of a Qt build => Use the CMake config files from the binary dir - list(APPEND CMAKE_PREFIX_PATH "${CMAKE_BINARY_DIR}") - # Also make sure the CMake config files do not recreate the already-existing targets - set(QT_NO_CREATE_TARGETS TRUE) -endif() - -find_package(Qt5 COMPONENTS DBus Network Test Concurrent Sql Widgets Xml Gui) # special case end # Generated from examples.pro. @@ -65,24 +50,5 @@ if(TARGET Qt::Gui) endif() # special case begin -if (NOT QT_STANDALONE_EXAMPLES_BUILD) - # We use AUTOMOC/UIC/RCC in the examples. Make sure to not fail on a fresh Qt build, that e.g. the moc binary does not exist yet. - - # This function gets all targets below this directory - function(get_all_targets _result _dir) - get_property(_subdirs DIRECTORY "${_dir}" PROPERTY SUBDIRECTORIES) - foreach(_subdir IN LISTS _subdirs) - get_all_targets(${_result} "${_subdir}") - endforeach() - get_property(_sub_targets DIRECTORY "${_dir}" PROPERTY BUILDSYSTEM_TARGETS) - set(${_result} ${${_result}} ${_sub_targets} PARENT_SCOPE) - endfunction() - - get_all_targets(targets "${CMAKE_CURRENT_SOURCE_DIR}") - - foreach(target ${targets}) - qt_autogen_tools(${target} ENABLE_AUTOGEN_TOOLS "moc" "uic" "rcc") - endforeach() - -endif() +qt_examples_build_end() # special case end |