diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-06-29 22:34:12 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-03 01:08:13 +0200 |
| commit | a8ec5e912f89d976f51cf9440e73cc8434410b38 (patch) | |
| tree | 8061877cd677b14b067990a7ac3d33b20d8fbfbf /mkspecs/features/ctest_testcase.prf | |
| parent | 13e1e30ec39e9039930a25d851bb525ec486a15d (diff) | |
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>
Diffstat (limited to 'mkspecs/features/ctest_testcase.prf')
| -rw-r--r-- | mkspecs/features/ctest_testcase.prf | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mkspecs/features/ctest_testcase.prf b/mkspecs/features/ctest_testcase.prf index 46c175ec5f..f8283a59db 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 } |