diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-05-22 10:22:08 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-05-22 11:12:54 +0000 |
| commit | c7fd10a022d07a3c1271bce771d30de32562a358 (patch) | |
| tree | 858f8559e9697dc13ea76134f9445b754f5dcb70 /qmake | |
| parent | 774088b677b03cd1857fd352f305a5fe15b9f5eb (diff) | |
Allow building the tests directory as a standalone CMake project
At the moment, Coin builds tests as a separate qmake invocation
against an installed Qt. We need to support the same with CMake.
Change the tests subdirectory to be a standalone CMake project when
CMake does not detect an existing QtTest target while processing the
subdirectory. If the target exists, it means we are building the whole
repo, if the target does not exist, we need to call find_package
to find the installed Qt.
Refactor and move around a few things to make standalone tests build
successfully:
- add a new macro to set up paths to find QtSetup
- add a new macro to find all macOS frameworks
- add a new macro to set up building tests
- add a new macro that actually builds the tests
- export the INSTALL_CMAKE_NAMESPACE value into the BuildInternals
Config file
- export the CMAKE_BUILD_TYPE value, because a test project doesn't
have a .git subdir and thus defaults to be built in Release
mode, even though qtbase might have been built in Debug, so to
avoid the mixing, the propagate the build type
- stop overriding INSTALL_CMAKE_NAMESPACE and
QT_CMAKE_EXPORT_NAMESPACE inside QtSetup if they are set, because
the tests project doesn't specify a major version, and if we
override the values, the moc / uic targets don't get the correct
major version prefix and configuration fails
Change-Id: Ibdb03687302567fe325a15f6d1cb922c76240675
Fixes: QTBUG-75090
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/CMakeLists.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index a1e7625650..04b89c3f95 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -8,9 +8,7 @@ qt_copy_or_install(DIRECTORY "${PROJECT_SOURCE_DIR}/mkspecs" DESTINATION ${mkspecs_install_dir}) # special case end -find_library(FWApplicationServices ApplicationServices) # special case -find_library(FWCoreServices CoreServices) # special case -find_library(FWFoundation Foundation) # special case +qt_find_apple_system_frameworks() # special case ##################################################################### ## qmake Binary: |