diff options
| author | Robert Maynard <rmaynard@nvidia.com> | 2022-03-01 21:37:37 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-03-02 17:21:16 (GMT) |
| commit | 78e8f1145670ad7326c4d06502315741805aa304 (patch) | |
| tree | 5684f7b05b8b8ec501f37ae85ccfbf82cee7cb46 | |
| parent | 4091d5c58cb3e300a6301c405d54ca8605db3425 (diff) | |
| download | CMake-78e8f1145670ad7326c4d06502315741805aa304.zip CMake-78e8f1145670ad7326c4d06502315741805aa304.tar.gz CMake-78e8f1145670ad7326c4d06502315741805aa304.tar.bz2 | |
cmake: Correct regression in `-B <dir> <src_dir>`
Fixes: #23285
| -rw-r--r-- | Source/cmake.cxx | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CommandLine/RunCMakeTest.cmake | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index fe4d252..f9e2d6e 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1556,7 +1556,7 @@ bool cmake::SetDirectoriesFromFile(const std::string& arg) // This function is called multiple times with the same path if (is_source_dir) { this->SetHomeDirectoryViaCommandLine(listPath, HomeDirArgStyle::Plain); - if (!no_build_tree) { + if (no_build_tree) { std::string cwd = cmSystemTools::GetCurrentWorkingDirectory(); this->SetHomeOutputDirectory(cwd); } diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake index 61527a8..8084983 100644 --- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake +++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake @@ -202,6 +202,7 @@ message(STATUS "CMAKE_BINARY_DIR='${CMAKE_BINARY_DIR}'") run_cmake_with_options(ExplicitDirs-C_buildsrcdir -B DummyBuildDir -S ${RunCMake_SOURCE_DIR}/C_buildsrcdir/src -C initial-cache.txt) # Test that full path works, too. run_cmake_with_options(ExplicitDirs-C_buildsrcdir -B DummyBuildDir -S ${RunCMake_SOURCE_DIR}/C_buildsrcdir/src -C ${RunCMake_TEST_BINARY_DIR}/initial-cache.txt) + run_cmake_with_options(ExplicitDirs-C_buildsrcdir -B DummyBuildDir ${RunCMake_SOURCE_DIR}/C_buildsrcdir/src -C ${RunCMake_TEST_BINARY_DIR}/initial-cache.txt) endfunction() run_ExplicitDirs() |