summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake/CTest
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-11-13 21:01:20 (GMT)
committerBrad King <brad.king@kitware.com>2013-11-15 19:38:18 (GMT)
commitbca67c710f21cdea70c9b23fe927c87135ee81d9 (patch)
treea661bbd7b31601f890ffbc7110bb242c92e1d8b5 /Tests/RunCMake/CTest
parent05923172f94d804dfba33957aa08ac88cc5cd0bd (diff)
downloadCMake-bca67c710f21cdea70c9b23fe927c87135ee81d9.zip
CMake-bca67c710f21cdea70c9b23fe927c87135ee81d9.tar.gz
CMake-bca67c710f21cdea70c9b23fe927c87135ee81d9.tar.bz2
build_command: Return a "cmake --build" command-line
Re-implement the build_command() command to use "cmake --build" instead of generating a native build tool invocation directly. This command will internally invoke the proper native build tool. This avoids requiring cmGlobalGenerator::GenerateBuildCommand to produce a string so that it can be later refactored to produce a vector with no quoting or escaping. It will also allow us to later teach CMake to delay the decision about which build tool to invoke until after the project build system is generated to disk. For example, on Visual Studio 10 and above the preferred command-line tool is MSBuild, but we need to fall back to devenv if the .sln has Intel Fortran .vfproj files.
Diffstat (limited to 'Tests/RunCMake/CTest')
-rw-r--r--Tests/RunCMake/CTest/BeforeProject-stderr.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/Tests/RunCMake/CTest/BeforeProject-stderr.txt b/Tests/RunCMake/CTest/BeforeProject-stderr.txt
index 354896b..2d934a4 100644
--- a/Tests/RunCMake/CTest/BeforeProject-stderr.txt
+++ b/Tests/RunCMake/CTest/BeforeProject-stderr.txt
@@ -1,6 +1,6 @@
-CMake Error at .*/Modules/CTest.cmake:[0-9]+ \(build_command\):
- build_command\(\) requires CMAKE_MAKE_PROGRAM to be defined. Call project\(\)
- or enable_language\(\) first.
+CMake Error at .*/Modules/CTestTargets.cmake:20 \(message\):
+ Do not include\(CTest\) before calling project\(\).
Call Stack \(most recent call first\):
- BeforeProject.cmake:[0-9]+ \(include\)
- CMakeLists.txt:[0-9]+ \(include\)
+ .*/Modules/CTest.cmake:297 \(include\)
+ BeforeProject.cmake:1 \(include\)
+ CMakeLists.txt:5 \(include\)