mirror of
https://github.com/Kitware/CMake.git
synced 2025-10-19 19:43:23 +08:00
Tests: Pass additional Qt information to Ninja and NMC tests
This commit is contained in:
@@ -143,14 +143,14 @@ if(CMAKE_GENERATOR MATCHES "Ninja")
|
|||||||
list(APPEND Ninja_ARGS -DTEST_Fortran=1)
|
list(APPEND Ninja_ARGS -DTEST_Fortran=1)
|
||||||
endif()
|
endif()
|
||||||
if(CMake_TEST_Qt5 AND Qt5Core_FOUND)
|
if(CMake_TEST_Qt5 AND Qt5Core_FOUND)
|
||||||
list(APPEND Ninja_ARGS -DCMake_TEST_Qt5=1 -DCMAKE_TEST_Qt5Core_Version=${Qt5Core_VERSION})
|
list(APPEND Ninja_ARGS -DCMake_TEST_Qt5=1 -DQt5Core_DIR=${Qt5Core_DIR} -DCMAKE_TEST_Qt5Core_Version=${Qt5Core_VERSION})
|
||||||
endif()
|
endif()
|
||||||
add_RunCMake_test(Ninja)
|
add_RunCMake_test(Ninja)
|
||||||
set(NinjaMultiConfig_ARGS
|
set(NinjaMultiConfig_ARGS
|
||||||
-DCYGWIN=${CYGWIN}
|
-DCYGWIN=${CYGWIN}
|
||||||
)
|
)
|
||||||
if(CMake_TEST_Qt5 AND Qt5Core_FOUND)
|
if(CMake_TEST_Qt5 AND Qt5Core_FOUND)
|
||||||
list(APPEND NinjaMultiConfig_ARGS -DCMake_TEST_Qt5=1)
|
list(APPEND NinjaMultiConfig_ARGS -DCMake_TEST_Qt5=1 -DQt5Core_DIR=${Qt5Core_DIR} -DCMAKE_TEST_Qt5Core_Version=${Qt5Core_VERSION})
|
||||||
endif()
|
endif()
|
||||||
if(DEFINED CMake_TEST_CUDA)
|
if(DEFINED CMake_TEST_CUDA)
|
||||||
list(APPEND NinjaMultiConfig_ARGS -DCMake_TEST_CUDA=${CMake_TEST_CUDA})
|
list(APPEND NinjaMultiConfig_ARGS -DCMake_TEST_CUDA=${CMake_TEST_CUDA})
|
||||||
|
@@ -327,6 +327,7 @@ run_ChangeBuildType()
|
|||||||
function(run_Qt5AutoMocDeps)
|
function(run_Qt5AutoMocDeps)
|
||||||
if(CMake_TEST_Qt5 AND CMAKE_TEST_Qt5Core_Version VERSION_GREATER_EQUAL 5.15.0)
|
if(CMake_TEST_Qt5 AND CMAKE_TEST_Qt5Core_Version VERSION_GREATER_EQUAL 5.15.0)
|
||||||
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/Qt5AutoMocDeps-build)
|
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/Qt5AutoMocDeps-build)
|
||||||
|
set(RunCMake_TEST_OPTIONS "-DQt5Core_DIR=${Qt5Core_DIR}")
|
||||||
run_cmake(Qt5AutoMocDeps)
|
run_cmake(Qt5AutoMocDeps)
|
||||||
unset(RunCMake_TEST_OPTIONS)
|
unset(RunCMake_TEST_OPTIONS)
|
||||||
# Build the project.
|
# Build the project.
|
||||||
|
@@ -300,7 +300,7 @@ endif()
|
|||||||
|
|
||||||
if(CMake_TEST_Qt5)
|
if(CMake_TEST_Qt5)
|
||||||
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/Qt5-build)
|
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/Qt5-build)
|
||||||
set(RunCMake_TEST_OPTIONS "-DCMAKE_CROSS_CONFIGS=all")
|
set(RunCMake_TEST_OPTIONS "-DCMAKE_CROSS_CONFIGS=all" "-DQt5Core_DIR=${Qt5Core_DIR}")
|
||||||
run_cmake_configure(Qt5)
|
run_cmake_configure(Qt5)
|
||||||
unset(RunCMake_TEST_OPTIONS)
|
unset(RunCMake_TEST_OPTIONS)
|
||||||
include(${RunCMake_TEST_BINARY_DIR}/target_files.cmake)
|
include(${RunCMake_TEST_BINARY_DIR}/target_files.cmake)
|
||||||
|
Reference in New Issue
Block a user