From f5dccc899a76999f0771c9dc95e6912951da51f5 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Mon, 3 Sep 2012 11:26:12 +0200 Subject: 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 Reviewed-by: Stephen Kelly Reviewed-by: Marcus D. Hanwell Reviewed-by: Rohan McGovern --- src/corelib/Qt5CTestMacros.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/corelib/Qt5CTestMacros.cmake') 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() -- cgit v1.2.3