diff options
| author | Petr Kmoch <petr.kmoch@gmail.com> | 2013-03-28 14:10:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-04-12 15:35:36 (GMT) |
| commit | ac9a5f4d943685f0b49b1a9d03f4e23238df0867 (patch) | |
| tree | 7027ff81ffd0e05a7c8c119499dbfc70417ad103 /Source/CTest/cmCTestBuildCommand.cxx | |
| parent | a6c0299c407bc4482140637c0460f71238b4f9d0 (diff) | |
| download | CMake-ac9a5f4d943685f0b49b1a9d03f4e23238df0867.zip CMake-ac9a5f4d943685f0b49b1a9d03f4e23238df0867.tar.gz CMake-ac9a5f4d943685f0b49b1a9d03f4e23238df0867.tar.bz2 | |
ctest_build: Pass projectDir to GenerateBuildCommand
This allows the ctest_build command's TARGET option to name a target
in a subdirectory and still build properly with msbuild.
Add test case covering use of ctest_build() with such a TARGET.
Diffstat (limited to 'Source/CTest/cmCTestBuildCommand.cxx')
| -rw-r--r-- | Source/CTest/cmCTestBuildCommand.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestBuildCommand.cxx b/Source/CTest/cmCTestBuildCommand.cxx index 5cb2a37..1f63185 100644 --- a/Source/CTest/cmCTestBuildCommand.cxx +++ b/Source/CTest/cmCTestBuildCommand.cxx @@ -130,10 +130,11 @@ cmCTestGenericHandler* cmCTestBuildCommand::InitializeHandler() cmakeBuildConfiguration = config; } + std::string dir = this->CTest->GetCTestConfiguration("BuildDirectory"); std::string buildCommand = this->GlobalGenerator-> GenerateBuildCommand(cmakeMakeProgram, - cmakeProjectName, 0, + cmakeProjectName, dir.c_str(), cmakeBuildAdditionalFlags, cmakeBuildTarget, cmakeBuildConfiguration, true, false); cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, |