diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-09-03 11:26:12 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-10 22:44:32 +0200 |
| commit | f5dccc899a76999f0771c9dc95e6912951da51f5 (patch) | |
| tree | 37ac3540f4f583abde54f0d546128e55bfb73010 /src | |
| parent | 6c3ee80589b4b25f215f501b372a9f8437aa0a30 (diff) | |
Specify the project name when adding a test.
On Windows, with the devenv makecommand, this seems to be necessary.
With msbuild it is not needed, nor with nmake, but it is no harm anyway.
This is also what CMake does in its unit tests.
Change-Id: I45f867e699c28a43ee607b47db108021fc7fef8b
Reviewed-by: Brad King <brad.king@kitware.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Marcus D. Hanwell <marcus.hanwell@kitware.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/Qt5CTestMacros.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/Qt5CTestMacros.cmake b/src/corelib/Qt5CTestMacros.cmake index d4a0b72987..a00b36bdbe 100644 --- a/src/corelib/Qt5CTestMacros.cmake +++ b/src/corelib/Qt5CTestMacros.cmake @@ -18,6 +18,7 @@ macro(expect_pass _dir) "${CMAKE_CURRENT_BINARY_DIR}/${_dir}" --build-generator ${CMAKE_GENERATOR} --build-makeprogram ${CMAKE_MAKE_PROGRAM} + --build-project ${testname} --build-options "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}" ${BUILD_OPTIONS_LIST} ) endmacro() @@ -52,6 +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-options "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}" ${BUILD_OPTIONS_LIST} ) endmacro() |