summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalUnixMakefileGenerator3.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-05-14 15:46:48 (GMT)
committerBrad King <brad.king@kitware.com>2021-05-17 14:01:57 (GMT)
commitd8d0f3ec377380af07b3185e82a4d853f556e4f9 (patch)
tree1160cb7a2617b6a5a6ead745db9ce575888b80c4 /Source/cmGlobalUnixMakefileGenerator3.cxx
parentf3b46057414a9face8724a431fc6473b444d68c5 (diff)
downloadCMake-d8d0f3ec377380af07b3185e82a4d853f556e4f9.zip
CMake-d8d0f3ec377380af07b3185e82a4d853f556e4f9.tar.gz
CMake-d8d0f3ec377380af07b3185e82a4d853f556e4f9.tar.bz2
Makefiles: Remove non-functioning relative path conversion
In CMake 3.6 and below, running cmake --build . --target "$(pwd)/SomeTarget" with a Makefiles generator automatically converted the target name and invoked `make SomeTarget`. This made the build command work even though make "$(pwd)/SomeTarget" would fail. This behavior was not implemented for any other generators, and does not make sense because `cmake --build` is supposed to be a thin wrapper around the native build tool. It has also been broken since commit 8d47a20f13 (cmOutputConverter: use new ConvertToRelativePath signature internally, 2016-06-16, v3.7.0-rc1~90^2~1) because cmState's relative path conversion logic is not initialized in `cmake --build`. Remove the non-functioning code.
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
-rw-r--r--Source/cmGlobalUnixMakefileGenerator3.cxx19
1 files changed, 0 insertions, 19 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 837c59f..9c3de1e 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -22,7 +22,6 @@
#include "cmOutputConverter.h"
#include "cmProperty.h"
#include "cmState.h"
-#include "cmStateDirectory.h"
#include "cmStateTypes.h"
#include "cmStringAlgorithms.h"
#include "cmSystemTools.h"
@@ -552,21 +551,6 @@ cmGlobalUnixMakefileGenerator3::GenerateBuildCommand(
bool fast, int jobs, bool verbose,
std::vector<std::string> const& makeOptions)
{
- std::unique_ptr<cmMakefile> mfu;
- cmMakefile* mf;
- if (!this->Makefiles.empty()) {
- mf = this->Makefiles[0].get();
- } else {
- cmStateSnapshot snapshot = this->CMakeInstance->GetCurrentSnapshot();
- snapshot.GetDirectory().SetCurrentSource(
- this->CMakeInstance->GetHomeDirectory());
- snapshot.GetDirectory().SetCurrentBinary(
- this->CMakeInstance->GetHomeOutputDirectory());
- snapshot.SetDefaultDefinitions();
- mfu = cm::make_unique<cmMakefile>(this, snapshot);
- mf = mfu.get();
- }
-
GeneratedMakeCommand makeCommand;
// Make it possible to set verbosity also from command line
@@ -597,9 +581,6 @@ cmGlobalUnixMakefileGenerator3::GenerateBuildCommand(
if (fast) {
tname += "/fast";
}
- tname =
- mf->GetStateSnapshot().GetDirectory().ConvertToRelPathIfContained(
- mf->GetState()->GetBinaryDirectory(), tname);
cmSystemTools::ConvertToOutputSlashes(tname);
makeCommand.Add(std::move(tname));
}