From 67de2905b00a178ac6e73636614c42fec8dbe5ed Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 12 Mar 2013 17:13:48 +0100 Subject: [PATCH] Join the CMAKE_PREFIX_PATH components into a cmake list before use. Change-Id: I16e05b72e57473239b89498313ba7745ffa6a346 Reviewed-by: Alexander Neundorf Reviewed-by: Stephen Kelly --- mkspecs/features/ctest_testcase.prf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/ctest_testcase.prf b/mkspecs/features/ctest_testcase.prf index 7e841de790f..a18c1898448 100644 --- a/mkspecs/features/ctest_testcase.prf +++ b/mkspecs/features/ctest_testcase.prf @@ -42,6 +42,7 @@ isEmpty(CMAKE_VERSION) { for(d, $$list($$split($$list($$[QMAKE_MKSPECS]), $$DIRLIST_SEPARATOR))) { CMAKE_PREFIX_PATH *= $$dirname(d) } + CMAKE_PREFIX_PATH=\"$$join(CMAKE_PREFIX_PATH, ;)\" dependentmodules = $$resolve_depends(CMAKE_QT_MODULES_UNDER_TEST, "QT.") dependentmodules -= $$CMAKE_QT_MODULES_UNDER_TEST @@ -49,7 +50,7 @@ isEmpty(CMAKE_VERSION) { check.commands = \ $(MKDIR) $$BUILD_DIR && cd $$BUILD_DIR && \ - cmake $$_PRO_FILE_PWD_ $$CMAKE_GENERATOR -DCMAKE_BUILD_TYPE=$${CMAKE_BUILD_TYPE} -DCMAKE_PREFIX_PATH=\"$$join(CMAKE_PREFIX_PATH, ;)\" -DQt5_MODULE_TEST_DEPENDS=\"$${dependentmodules}\" && \ + cmake $$_PRO_FILE_PWD_ $$CMAKE_GENERATOR -DCMAKE_BUILD_TYPE=$${CMAKE_BUILD_TYPE} -DCMAKE_PREFIX_PATH=$$CMAKE_PREFIX_PATH -DQt5_MODULE_TEST_DEPENDS=\"$${dependentmodules}\" && \ $(TESTRUNNER) ctest --output-on-failure }