diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-08-10 11:13:02 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-13 09:31:16 +0200 |
| commit | 7bfb10b4980d15128d47ff64cbe21c246616a4f7 (patch) | |
| tree | 05ba550133e7b696f8b9b39b868c019d637df860 | |
| parent | 4ff51dd8b25bed86e4bf43e6412e6e3b63f27722 (diff) | |
Add hints for where to find packages for projects expected to fail.
In the CI system, an environment variable is used to convey
the CMAKE_PREFIX_PATH, but that can not be relied upon.
Change-Id: Ie4fbacaac6ae18f95a3b4d1e796a4b4c91a418c4
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| -rw-r--r-- | tests/auto/cmake/test_testlib_no_link_gui/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | tests/auto/cmake/test_testlib_no_link_widgets/CMakeLists.txt | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/tests/auto/cmake/test_testlib_no_link_gui/CMakeLists.txt b/tests/auto/cmake/test_testlib_no_link_gui/CMakeLists.txt index f1727eb72d..29e9e38692 100644 --- a/tests/auto/cmake/test_testlib_no_link_gui/CMakeLists.txt +++ b/tests/auto/cmake/test_testlib_no_link_gui/CMakeLists.txt @@ -5,8 +5,12 @@ project(no_link_gui) set(CMAKE_INCLUDE_CURRENT_DIR ON) -find_package(Qt5Gui REQUIRED) -find_package(Qt5Test REQUIRED) +if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/FindPackageHints.cmake") + include("${CMAKE_CURRENT_LIST_DIR}/FindPackageHints.cmake") +endif() + +find_package(Qt5Gui REQUIRED HINTS ${Qt5Tests_PREFIX_PATH}) +find_package(Qt5Test REQUIRED HINTS ${Qt5Tests_PREFIX_PATH}) include_directories( ${Qt5Gui_INCLUDE_DIRS} diff --git a/tests/auto/cmake/test_testlib_no_link_widgets/CMakeLists.txt b/tests/auto/cmake/test_testlib_no_link_widgets/CMakeLists.txt index 8b4311c850..05b0dbb4f2 100644 --- a/tests/auto/cmake/test_testlib_no_link_widgets/CMakeLists.txt +++ b/tests/auto/cmake/test_testlib_no_link_widgets/CMakeLists.txt @@ -5,8 +5,12 @@ project(no_link_widgets) set(CMAKE_INCLUDE_CURRENT_DIR ON) -find_package(Qt5Widgets REQUIRED) -find_package(Qt5Test REQUIRED) +if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/FindPackageHints.cmake") + include("${CMAKE_CURRENT_LIST_DIR}/FindPackageHints.cmake") +endif() + +find_package(Qt5Widgets REQUIRED HINTS ${Qt5Tests_PREFIX_PATH}) +find_package(Qt5Test REQUIRED HINTS ${Qt5Tests_PREFIX_PATH}) include_directories( ${Qt5Widgets_INCLUDE_DIRS} |