diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-09-03 16:31:28 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-09-04 07:41:57 +0000 |
| commit | 43ee53c233f22014befc99c12951d69379ec672e (patch) | |
| tree | a9b8115b67ef13c4602571842597fed7cf886f51 /src/CMakeLists.txt | |
| parent | 80054d1971512901d52e96f387364b87dbdc4ec4 (diff) | |
CMake build: Qt6 build fixes
Set Qt5_VERSION for version checks (e.g. currently still JavaScript
locator filter).
Export special FindQt5.cmake for external plugins and super-repo builds.
Change-Id: I5edb8b0e8bef1a341cd2ff04a13d0a6ce22f6558
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index af0c062c7b..cc8a731820 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -35,8 +35,11 @@ install(EXPORT QtCreator ) file(WRITE ${CMAKE_BINARY_DIR}/cmake/QtCreatorConfig.cmake " +\# add module path for special FindQt5.cmake that considers Qt6 too +list(APPEND CMAKE_MODULE_PATH \${CMAKE_CURRENT_LIST_DIR}) + include(CMakeFindDependencyMacro) -find_dependency(Qt5 +find_dependency(Qt5 ${IDE_QT_VERSION_MIN} COMPONENTS Concurrent Core Network PrintSupport Qml Quick QuickWidgets Sql REQUIRED ) @@ -72,6 +75,7 @@ file(COPY ${PROJECT_SOURCE_DIR}/cmake/QtCreatorDocumentation.cmake ${PROJECT_SOURCE_DIR}/cmake/QtCreatorAPI.cmake ${PROJECT_SOURCE_DIR}/cmake/QtCreatorAPIInternal.cmake + ${PROJECT_SOURCE_DIR}/cmake/FindQt5.cmake DESTINATION ${CMAKE_BINARY_DIR}/cmake ) |