Forward the CMAKE_PREFIX_PATH to invoked tests.

Change-Id: I5166fb39dcf3ab660c971c4c68b714f534de40cb
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

diff --git a/src/corelib/Qt5CTestMacros.cmake b/src/corelib/Qt5CTestMacros.cmake
index c2772bb..a6d8adf 100644 (file)
--- 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}
     "${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()
 
   )
 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}
     "${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()
   )
 endmacro()