diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-11-02 09:02:58 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-11-06 17:17:21 +0100 |
| commit | 7ccc1420f29ae2a91439803941e89b82ff3bc071 (patch) | |
| tree | 3de7a67cc074f75bc363d44b83ef2d3e63ce530c | |
| parent | 22d80b5489525a1190381a39114d49450cbbc57c (diff) | |
CMake: Deduplicate qtbase source path references
Change-Id: I857d97c3844ab0a9fe728a499aac1ecd07a1c779
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 18eba9de..b4d37123 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,8 @@ +set(__qt6_qtbase_src_path "${CMAKE_CURRENT_SOURCE_DIR}/qtbase") + cmake_minimum_required(VERSION 3.15.0) -include(${CMAKE_CURRENT_SOURCE_DIR}/qtbase/cmake/QtAutoDetect.cmake) +include("${__qt6_qtbase_src_path}/cmake/QtAutoDetect.cmake") project(Qt VERSION 6.0.0 @@ -42,9 +44,10 @@ endfunction() list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") if (NOT QT_BUILD_STANDALONE_TESTS) - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/qtbase/cmake") - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/qtbase/cmake/3rdparty/extra-cmake-modules/find-modules") - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/qtbase/cmake/3rdparty/kwin") + list(APPEND CMAKE_MODULE_PATH "${__qt6_qtbase_src_path}/cmake") + list(APPEND CMAKE_MODULE_PATH + "${__qt6_qtbase_src_path}/cmake/3rdparty/extra-cmake-modules/find-modules") + list(APPEND CMAKE_MODULE_PATH "${__qt6_qtbase_src_path}/cmake/3rdparty/kwin") endif() include(ECMOptionalAddSubdirectory) |