diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-09-21 15:02:44 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-24 18:00:56 +0200 |
commit | f5bdefca0b30d50b74b4fc4d168beba9a3a5bee6 (patch) | |
tree | 95eb7fe10503e9cfb33575552fa6e3b227ba8d0e /src/corelib/Qt5CTestMacros.cmake | |
parent | wrap QLibrary related code with QT_NO_LIBRARY (diff) | |
download | qtbase-f5bdefca0b30d50b74b4fc4d168beba9a3a5bee6.tar.xz qtbase-f5bdefca0b30d50b74b4fc4d168beba9a3a5bee6.zip |
Don't append _build to the directory name of tests expected to fail.
The name passed to the project() command must be the same as the argument
to ctest --build-project.
Initially I had appended _build to disambiguate the generated project
from the project under test, but that is not needed anyway as the
project under test is self-contained, so it's ok.
Task-number: QTBUG-27087
Change-Id: I648d57271529d4e8d308ff60b81419ade29b2e44
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'src/corelib/Qt5CTestMacros.cmake')
-rw-r--r-- | src/corelib/Qt5CTestMacros.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/Qt5CTestMacros.cmake b/src/corelib/Qt5CTestMacros.cmake index a00b36bdbe..49e47f9282 100644 --- a/src/corelib/Qt5CTestMacros.cmake +++ b/src/corelib/Qt5CTestMacros.cmake @@ -34,7 +34,7 @@ macro(expect_fail _dir) file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/failbuild/${_dir}/CMakeLists.txt" " cmake_minimum_required(VERSION 2.8) - project(${_dir}_build) + project(${_dir}) try_compile(Result \${CMAKE_CURRENT_BINARY_DIR}/${_dir} \${CMAKE_CURRENT_SOURCE_DIR}/${_dir} |