From f03ef8d8f45e898236a9b949cdfa41c89c6c6b76 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Fri, 21 Sep 2012 15:11:54 +0200 Subject: [PATCH] Pass the unmodified directory/project name to build-project. The result of replacements for special characters should not be used here. CTest needs the replacements for the test names, but requires the argument to the project() command to match the argument to ctest --build-project. Task-number: QTBUG-27087 Change-Id: I4ff7a7e00ddb65ab0c0f2305901e1d03f46e07d1 Reviewed-by: Rohan McGovern --- src/corelib/Qt5CTestMacros.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/Qt5CTestMacros.cmake b/src/corelib/Qt5CTestMacros.cmake index 49e47f9282..3c279ee138 100644 --- a/src/corelib/Qt5CTestMacros.cmake +++ b/src/corelib/Qt5CTestMacros.cmake @@ -18,7 +18,7 @@ macro(expect_pass _dir) "${CMAKE_CURRENT_BINARY_DIR}/${_dir}" --build-generator ${CMAKE_GENERATOR} --build-makeprogram ${CMAKE_MAKE_PROGRAM} - --build-project ${testname} + --build-project ${_dir} --build-options "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}" ${BUILD_OPTIONS_LIST} ) endmacro() @@ -53,7 +53,7 @@ macro(expect_fail _dir) "${CMAKE_CURRENT_BINARY_DIR}/failbuild/${_dir}/build" --build-generator ${CMAKE_GENERATOR} --build-makeprogram ${CMAKE_MAKE_PROGRAM} - --build-project ${testname} + --build-project ${_dir} --build-options "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}" ${BUILD_OPTIONS_LIST} ) endmacro()