diff options
| -rw-r--r-- | src/corelib/Qt5CTestMacros.cmake | 3 | ||||
| -rw-r--r-- | tests/auto/cmake/test_add_resource_options/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tests/auto/cmake/test_wrap_cpp_options/CMakeLists.txt | 6 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/corelib/Qt5CTestMacros.cmake b/src/corelib/Qt5CTestMacros.cmake index a6d8adfc7d..468c42e0b2 100644 --- a/src/corelib/Qt5CTestMacros.cmake +++ b/src/corelib/Qt5CTestMacros.cmake @@ -17,6 +17,9 @@ macro(expect_fail _dir) string(REPLACE ")" "_" testname "${testname}") file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/failbuild/${_dir}") file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/${_dir}" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/failbuild/${_dir}") + + file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/failbuild/${_dir}/${_dir}/FindPackageHints.cmake" "set(Qt5Tests_PREFIX_PATH \"${CMAKE_PREFIX_PATH}\")") + file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/failbuild/${_dir}/CMakeLists.txt" " cmake_minimum_required(VERSION 2.8) diff --git a/tests/auto/cmake/test_add_resource_options/CMakeLists.txt b/tests/auto/cmake/test_add_resource_options/CMakeLists.txt index e79b954f3d..a358094546 100644 --- a/tests/auto/cmake/test_add_resource_options/CMakeLists.txt +++ b/tests/auto/cmake/test_add_resource_options/CMakeLists.txt @@ -3,7 +3,11 @@ cmake_minimum_required(VERSION 2.8) project(test_add_resource_options) -find_package(Qt5Core REQUIRED) +if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/FindPackageHints.cmake") + include("${CMAKE_CURRENT_LIST_DIR}/FindPackageHints.cmake") +endif() + +find_package(Qt5Core REQUIRED HINTS ${Qt5Tests_PREFIX_PATH}) include_directories(${Qt5Core_INCLUDE_DIRS}) diff --git a/tests/auto/cmake/test_wrap_cpp_options/CMakeLists.txt b/tests/auto/cmake/test_wrap_cpp_options/CMakeLists.txt index a7a2c0e045..0704edb58f 100644 --- a/tests/auto/cmake/test_wrap_cpp_options/CMakeLists.txt +++ b/tests/auto/cmake/test_wrap_cpp_options/CMakeLists.txt @@ -3,7 +3,11 @@ cmake_minimum_required(VERSION 2.8) project(test_wrap_cpp_options) -find_package(Qt5Core REQUIRED) +if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/FindPackageHints.cmake") + include("${CMAKE_CURRENT_LIST_DIR}/FindPackageHints.cmake") +endif() + +find_package(Qt5Core REQUIRED HINTS ${Qt5Tests_PREFIX_PATH}) include_directories(${Qt5Core_INCLUDE_DIRS}) |