mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-07 22:59:56 -05:00
Merge topic 'remove-old-compatibility'
785523a136Remove compatibility with CMake versions older than 2.8.035282387eaCMP0014: Remove support for OLD behaviorfad9c55b8bCMP0013: Remove support for OLD behavior98a59ba8adCMP0012: Remove support for OLD behavior3c0dbb66f5CMP0011: Remove support for OLD behaviorcf832e75bcCMP0010: Remove support for OLD behavior77f8c374f3CMP0009: Remove support for OLD behavior43ef139567CMP0008: Remove support for OLD behavior ... Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !10188
This commit is contained in:
@@ -2650,27 +2650,6 @@ int cmake::ActualConfigure()
|
||||
// if the project did not define one of the entries below, add them now
|
||||
// so users can edit the values in the cache:
|
||||
|
||||
// We used to always present LIBRARY_OUTPUT_PATH and
|
||||
// EXECUTABLE_OUTPUT_PATH. They are now documented as old-style and
|
||||
// should no longer be used. Therefore we present them only if the
|
||||
// project requires compatibility with CMake 2.4. We detect this
|
||||
// here by looking for the old CMAKE_BACKWARDS_COMPATIBILITY
|
||||
// variable created when CMP0001 is not set to NEW.
|
||||
if (this->State->GetInitializedCacheValue("CMAKE_BACKWARDS_COMPATIBILITY")) {
|
||||
if (!this->State->GetInitializedCacheValue("LIBRARY_OUTPUT_PATH")) {
|
||||
this->AddCacheEntry(
|
||||
"LIBRARY_OUTPUT_PATH", "",
|
||||
"Single output directory for building all libraries.",
|
||||
cmStateEnums::PATH);
|
||||
}
|
||||
if (!this->State->GetInitializedCacheValue("EXECUTABLE_OUTPUT_PATH")) {
|
||||
this->AddCacheEntry(
|
||||
"EXECUTABLE_OUTPUT_PATH", "",
|
||||
"Single output directory for building all executables.",
|
||||
cmStateEnums::PATH);
|
||||
}
|
||||
}
|
||||
|
||||
const auto& mf = this->GlobalGenerator->GetMakefiles()[0];
|
||||
|
||||
if (mf->IsOn("CTEST_USE_LAUNCHERS") &&
|
||||
|
||||
Reference in New Issue
Block a user