mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-20 03:46:44 +08:00
CMake: Adjust to new location of RunCMakeTestHelpers in qtbase
Adjust the path to where expect to find the QtRunCMakeTestHelpers
module in qtbase.
Replace the usage of 'QtIRRunCMake' with 'RunCMake' in the root test
CMakeLists.txt.
Pass the current source dir as an extra module path to the RunCMake
test, so it can find the Common module without relying on relative
paths, so that any build dir works.
Remove the unnecessary forwarding of CMAKE_SYSTEM_NAME.
Amends e552513c9f
Change-Id: If804bcb36a0bd3df6e4617e56c146094793138c4
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
This commit is contained in:
@@ -2,11 +2,13 @@
|
||||
# SPDX-License-Identifier: BSD-3-Clause
|
||||
|
||||
cmake_minimum_required(VERSION 3.16)
|
||||
include("${CMAKE_CURRENT_SOURCE_DIR}/../Common.cmake")
|
||||
|
||||
list(APPEND CMAKE_MODULE_PATH "${EXTRA_MODULE_PATH}")
|
||||
include(Common)
|
||||
|
||||
# The file is included separately from Common.cmake because it has side-effects
|
||||
# that we want to apply only in the RunCMake part of the test.
|
||||
include(QtIRRunCMake)
|
||||
include(RunCMake)
|
||||
|
||||
# Uses prefix set from outside scope.
|
||||
function(run_suite_command name)
|
||||
|
||||
Reference in New Issue
Block a user