summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-06-29 08:34:28 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-03 01:08:30 +0200
commitf9c73f0785cd19ddd535778270446b7747f217d2 (patch)
tree3367d8ea6afcbb4f07a50932ad42b7ec209cbde2 /src
parent91720b5bc22410177512abcaea9716de5446162e (diff)
Forward the CMAKE_PREFIX_PATH to invoked tests.
Change-Id: I5166fb39dcf3ab660c971c4c68b714f534de40cb Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/Qt5CTestMacros.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/Qt5CTestMacros.cmake b/src/corelib/Qt5CTestMacros.cmake
index c2772bb702..a6d8adfc7d 100644
--- a/src/corelib/Qt5CTestMacros.cmake
+++ b/src/corelib/Qt5CTestMacros.cmake
@@ -8,7 +8,7 @@ macro(expect_pass _dir)
"${CMAKE_CURRENT_BINARY_DIR}/${_dir}"
--build-generator ${CMAKE_GENERATOR}
--build-makeprogram ${CMAKE_MAKE_PROGRAM}
- --build-options -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+ --build-options "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}"
)
endmacro()
@@ -39,6 +39,6 @@ macro(expect_fail _dir)
"${CMAKE_CURRENT_BINARY_DIR}/failbuild/${_dir}/build"
--build-generator ${CMAKE_GENERATOR}
--build-makeprogram ${CMAKE_MAKE_PROGRAM}
- --build-options -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+ --build-options "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}"
)
endmacro()