From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Fri, 29 Jun 2012 20:34:12 +0000 (+0200)
Subject: Simplify logic for paths to CMake modules in tests.
X-Git-Tag: 071012110112~141
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a8ec5e912f89d976f51cf9440e73cc8434410b38;p=profile%2Fivi%2Fqtbase.git

Simplify logic for paths to CMake modules in tests.

Use a command line argument instead of an environment variable.

Change-Id: I518b21d1fb9567d182384885a308c76e108598d8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---

diff --git a/mkspecs/features/ctest_testcase.prf b/mkspecs/features/ctest_testcase.prf
index 46c175e..f8283a5 100644
--- a/mkspecs/features/ctest_testcase.prf
+++ b/mkspecs/features/ctest_testcase.prf
@@ -26,18 +26,14 @@ isEmpty(CMAKE_VERSION) {
         isEmpty(VERSION_OK) {
             message("cmake $$CMAKE_VERSION is too old for this test.")
         } else {
-            SET = set
-            equals(QMAKE_DIR_SEP, "/"):SET = export
-
             CMAKE_BUILD_TYPE = Debug
             CONFIG(release, debug|release):CMAKE_BUILD_TYPE = Release
 
             BUILD_DIR = $$replace($$list($$OUT_PWD/build), /, $$QMAKE_DIR_SEP)
 
             check.commands = \
-                cd . && $$SET CMAKE_PREFIX_PATH=$$[QT_INSTALL_PREFIX] && \
                 $(MKDIR) $$BUILD_DIR && cd $$BUILD_DIR && \
-                cmake $$_PRO_FILE_PWD_ -DCMAKE_BUILD_TYPE=$${CMAKE_BUILD_TYPE} && \
+                cmake $$_PRO_FILE_PWD_ -DCMAKE_BUILD_TYPE=$${CMAKE_BUILD_TYPE} -DCMAKE_PREFIX_PATH=\"$$[QT_INSTALL_PREFIX]\" && \
                 $(TESTRUNNER) ctest --output-on-failure
 
         }