diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-11 19:01:12 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-06-11 20:04:21 (GMT) |
| commit | 90ad087ab9075cc9648df0623502da0caa44e971 (patch) | |
| tree | 12a4d2ac794e386bc4480b01d53dcb5d1953be22 /Tests/RunCMake/CommandLine/RunCMakeTest.cmake | |
| parent | 7195ec92b2f34ef16ff1382fb00f527a3609f3bf (diff) | |
| download | CMake-90ad087ab9075cc9648df0623502da0caa44e971.zip CMake-90ad087ab9075cc9648df0623502da0caa44e971.tar.gz CMake-90ad087ab9075cc9648df0623502da0caa44e971.tar.bz2 | |
cmake: Fix --build <relative-dir> for VS generators (#15609)
The VS >= 10 generators need to parse the .sln file from the build
directory to locate targets in subdirectories. This occurs after we
change the working directory to the build tree. If a relative directory
other than "." was given then we would change to it and also refer to
the .sln file location with it. Fix this by converting the build tree
to a full path always. This will also give a more informative error
message when the directory does not exist.
Diffstat (limited to 'Tests/RunCMake/CommandLine/RunCMakeTest.cmake')
| -rw-r--r-- | Tests/RunCMake/CommandLine/RunCMakeTest.cmake | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake index 416b94e..84d4cc9 100644 --- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake +++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake @@ -28,9 +28,24 @@ run_cmake_command(build-no-cache ${CMAKE_COMMAND} --build ${RunCMake_SOURCE_DIR}) run_cmake_command(build-no-generator ${CMAKE_COMMAND} --build ${RunCMake_SOURCE_DIR}/cache-no-generator) +run_cmake_command(build-bad-dir + ${CMAKE_COMMAND} --build dir-does-not-exist) run_cmake_command(build-bad-generator ${CMAKE_COMMAND} --build ${RunCMake_SOURCE_DIR}/cache-bad-generator) +function(run_BuildDir) + # Use a single build tree for a few tests without cleaning. + set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/BuildDir-build) + set(RunCMake_TEST_NO_CLEAN 1) + file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}") + file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}") + + run_cmake(BuildDir) + run_cmake_command(BuildDir--build ${CMAKE_COMMAND} -E chdir .. + ${CMAKE_COMMAND} --build BuildDir-build --target CustomTarget) +endfunction() +run_BuildDir() + if(RunCMake_GENERATOR STREQUAL "Ninja") # Use a single build tree for a few tests without cleaning. set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/Build-build) |