Merge topic 'remove-old-compatibility'

381c446ff7 VS: Remove support for appending a platform to the generator name
dc24d88062 Remove compatibility with CMake versions older than 3.1
90d814f024 CMP0054: Remove support for OLD behavior
292aaffb78 Source: Remove unused cmCommandArgument{Lexer,Parser}
1150fae89a CMP0053: Remove support for OLD behavior
f0b1ca4d70 CMP0052: Remove support for OLD behavior
e4fddc8e37 CMP0051: Remove support for OLD behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10205
This commit is contained in:
Brad King
2025-01-21 14:42:47 +00:00
committed by Kitware Robot
259 changed files with 223 additions and 7668 deletions
-1
View File
@@ -3,7 +3,6 @@
cmake_policy(PUSH)
cmake_policy(SET CMP0057 NEW) # if IN_LIST
cmake_policy(SET CMP0054 NEW)
# Function to print messages of this module
function(_ios_install_combined_message)
-6
View File
@@ -1,10 +1,6 @@
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
# file Copyright.txt or https://cmake.org/licensing for details.
cmake_policy(PUSH)
cmake_policy(SET CMP0053 NEW)
cmake_policy(SET CMP0054 NEW)
# Function to parse implicit linker options.
#
# This is used internally by CMake and should not be included by user
@@ -401,5 +397,3 @@ function(cmake_parse_implicit_link_info2 text log_var obj_regex)
set(${EXTRA_PARSE_COMPUTE_IMPLICIT_OBJECTS} "${implicit_objs}" PARENT_SCOPE)
endif()
endfunction()
cmake_policy(POP)
@@ -1,10 +1,6 @@
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
# file Copyright.txt or https://cmake.org/licensing for details.
cmake_policy(PUSH)
cmake_policy(SET CMP0053 NEW)
cmake_policy(SET CMP0054 NEW)
# Function parse implicit linker options.
# This is used internally by CMake and should not be included by user
# code.
@@ -50,5 +46,3 @@ function(cmake_parse_library_architecture lang implicit_dirs implicit_objs outpu
set(${output_var} "${library_arch}" PARENT_SCOPE)
endif()
endfunction()
cmake_policy(POP)
-5
View File
@@ -59,9 +59,6 @@ For example:
include_guard(GLOBAL)
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
macro(CHECK_SYMBOL_EXISTS SYMBOL FILES VARIABLE)
if(CMAKE_C_COMPILER_LOADED)
__CHECK_SYMBOL_EXISTS_FILTER_FLAGS(C)
@@ -185,5 +182,3 @@ int main(int argc, char** argv)
unset(_CSE_SOURCE)
endif()
endmacro()
endblock()
-1
View File
@@ -150,7 +150,6 @@ get_filename_component(__check_type_size_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
include_guard(GLOBAL)
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
cmake_policy(SET CMP0159 NEW) # file(STRINGS) with REGEX updates CMAKE_MATCH_<n>
#-----------------------------------------------------------------------------
-1
View File
@@ -1301,7 +1301,6 @@ The custom step could then be triggered from the main build like so::
include(${CMAKE_CURRENT_LIST_DIR}/ExternalProject/shared_internal_commands.cmake)
cmake_policy(PUSH)
cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
cmake_policy(SET CMP0057 NEW) # if() supports IN_LIST
define_property(DIRECTORY PROPERTY "EP_BASE" INHERITED)
-1
View File
@@ -401,7 +401,6 @@ Deprecated Hint Variables
#]=======================================================================]
cmake_policy(PUSH)
cmake_policy(SET CMP0054 NEW) # quoted if arguments
cmake_policy(SET CMP0057 NEW) # if IN_LIST
# For backwards compatibility support
-1
View File
@@ -111,7 +111,6 @@ to know what include directories are needed.
#]=======================================================================]
cmake_policy(PUSH)
cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
cmake_policy(SET CMP0057 NEW) # if IN_LIST
cmake_policy(SET CMP0159 NEW) # file(STRINGS) with REGEX updates CMAKE_MATCH_<n>
-1
View File
@@ -34,7 +34,6 @@ for how these variables are initialized.
#]========================================]
cmake_policy(PUSH)
cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
cmake_policy(SET CMP0057 NEW) # if IN_LIST
### Common stuff ####
-5
View File
@@ -151,9 +151,6 @@ Macros
this value through the variable ``${dir}``.
#]=======================================================================]
cmake_policy(PUSH)
cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
# Convert a cache variable to PATH type
macro(_GNUInstallDirs_cache_convert_to_path var description)
@@ -452,5 +449,3 @@ foreach(dir
)
GNUInstallDirs_get_absolute_install_dir(CMAKE_INSTALL_FULL_${dir} CMAKE_INSTALL_${dir} ${dir})
endforeach()
cmake_policy(POP)
@@ -65,9 +65,6 @@ may be set prior to including the module to adjust behavior:
Support for installing Intel compiler runtimes.
#]=======================================================================]
cmake_policy(PUSH)
cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
set(_IRSL_HAVE_Intel FALSE)
set(_IRSL_HAVE_MSVC FALSE)
foreach(LANG IN ITEMS C CXX Fortran)
@@ -806,5 +803,3 @@ if(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS)
)
endif()
endif()
cmake_policy(POP)
@@ -6,10 +6,6 @@
# If successful, sets CMAKE_<lang>_COMPILER_LINKER_ID and
# CMAKE_<lang>_COMPILER_LINKER_VERSION
cmake_policy(PUSH)
cmake_policy(SET CMP0053 NEW)
cmake_policy(SET CMP0054 NEW)
function(cmake_determine_linker_id lang linker)
if (NOT linker)
# linker was not identified
@@ -103,5 +99,3 @@ function(cmake_determine_linker_id lang linker)
unset(CMAKE_${lang}_COMPILER_LINKER_VERSION PARENT_SCOPE)
endif()
endfunction()
cmake_policy(POP)
@@ -8,10 +8,6 @@
include_guard(GLOBAL)
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
cmake_policy(SET CMP0057 NEW) # if() supports IN_LIST
macro(CMAKE_CHECK_FLAG_COMMON_INIT _FUNC _LANG _SRC _PATTERNS)
if("${_LANG}" STREQUAL "C")
set(${_SRC} "int main(void) { return 0; }")
@@ -75,5 +71,3 @@ macro(CMAKE_CHECK_FLAG_COMMON_FINISH)
set(ENV{${v}} ${_CMAKE_CHECK_FLAG_COMMON_CONFIG_locale_vars_saved_${v}})
endforeach()
endmacro()
endblock()
-5
View File
@@ -6,9 +6,6 @@ include(Internal/CheckFlagCommonConfig)
include(Internal/CheckSourceCompiles)
include(CMakeCheckCompilerFlagCommonPatterns)
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
function(CMAKE_CHECK_LINKER_FLAG _lang _flag _var)
# link step supports less languages than the compiler
# so do a first check about the requested language
@@ -48,5 +45,3 @@ function(CMAKE_CHECK_LINKER_FLAG _lang _flag _var)
cmake_check_flag_common_finish()
endfunction()
endblock()
@@ -4,7 +4,6 @@
include_guard(GLOBAL)
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
cmake_policy(SET CMP0057 NEW) # if() supports IN_LIST
function(CMAKE_CHECK_SOURCE_COMPILES _lang _source _var)
-1
View File
@@ -4,7 +4,6 @@
include_guard(GLOBAL)
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
cmake_policy(SET CMP0057 NEW) # if() supports IN_LIST
function(CMAKE_CHECK_SOURCE_RUNS _lang _source _var)
@@ -9,9 +9,6 @@ if(NOT APPLE)
return()
endif()
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
function(__cmake_internal_workaround_headerpad_flag_conflict _LANG)
# Until we can avoid hard-coding -Wl,-headerpad_max_install_names in the
@@ -65,5 +62,3 @@ foreach(__lang IN LISTS __enabled_languages)
endforeach()
unset(__lang)
unset(__enabled_languages)
endblock()
-1
View File
@@ -6,7 +6,6 @@
include_guard()
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
cmake_policy(SET CMP0140 NEW)
function(__linker_gnu lang)
-6
View File
@@ -3,10 +3,6 @@
include_guard()
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
macro(__linker_lld lang)
if(CMAKE_${lang}_COMPILER_LINKER_FRONTEND_VARIANT STREQUAL "MSVC")
include(Linker/MSVC)
@@ -18,5 +14,3 @@ macro(__linker_lld lang)
__linker_gnu(${lang})
endif()
endmacro()
endblock()
-5
View File
@@ -5,9 +5,6 @@
# This module is shared by multiple linkers; use include blocker.
include_guard()
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
macro(__linker_mold lang)
if(CMAKE_EFFECTIVE_SYSTEM_NAME STREQUAL "Apple")
include(Linker/AppleClang)
@@ -19,5 +16,3 @@ macro(__linker_mold lang)
__linker_gnu(${lang})
endif()
endmacro()
endblock()
@@ -1,9 +1,6 @@
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
# file Copyright.txt or https://cmake.org/licensing for details.
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
if(NOT _CMAKE_SYSTEM_LINKER_TYPE)
block(SCOPE_FOR VARIABLES)
execute_process(COMMAND "${CMAKE_LINKER}" --version
@@ -18,5 +15,3 @@ if(NOT _CMAKE_SYSTEM_LINKER_TYPE)
endif()
endblock()
endif()
endblock()
@@ -2,14 +2,8 @@
# file Copyright.txt or https://cmake.org/licensing for details.
include(Platform/Linker/BSD-Linker-Initialize)
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
if(_CMAKE_SYSTEM_LINKER_TYPE STREQUAL "GNU")
include(Platform/Linker/FreeBSD-GNU-ASM)
else()
include(Platform/Linker/FreeBSD-LLD-ASM)
endif()
endblock()
-5
View File
@@ -3,13 +3,8 @@
include(Platform/Linker/BSD-Linker-Initialize)
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
if(_CMAKE_SYSTEM_LINKER_TYPE STREQUAL "GNU")
include(Platform/Linker/FreeBSD-GNU-C)
else()
include(Platform/Linker/FreeBSD-LLD-C)
endif()
endblock()
@@ -3,13 +3,8 @@
include(Platform/Linker/BSD-Linker-Initialize)
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
if(_CMAKE_SYSTEM_LINKER_TYPE STREQUAL "GNU")
include(Platform/Linker/FreeBSD-GNU-CXX)
else()
include(Platform/Linker/FreeBSD-LLD-CXX)
endif()
endblock()
@@ -3,13 +3,8 @@
include(Platform/Linker/BSD-Linker-Initialize)
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
if(_CMAKE_SYSTEM_LINKER_TYPE STREQUAL "GNU")
include(Platform/Linker/FreeBSD-GNU-Fortran)
else()
include(Platform/Linker/FreeBSD-LLD-Fortran)
endif()
endblock()
-5
View File
@@ -5,9 +5,6 @@
# This module is shared by multiple languages; use include blocker.
include_guard()
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
# WHOLE_ARCHIVE Feature for LINK_LIBRARY generator expression
## check linker capabilities
function(__cmake_set_whole_archive_feature __linker)
@@ -47,5 +44,3 @@ endfunction()
## Configure system linker
__cmake_set_whole_archive_feature("${CMAKE_LINKER}")
endblock()
@@ -3,13 +3,8 @@
include(Platform/Linker/BSD-Linker-Initialize)
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
if(_CMAKE_SYSTEM_LINKER_TYPE STREQUAL "GNU")
include(Platform/Linker/OpenBSD-GNU-ASM)
else()
include(Platform/Linker/OpenBSD-LLD-ASM)
endif()
endblock()
-5
View File
@@ -3,13 +3,8 @@
include(Platform/Linker/BSD-Linker-Initialize)
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
if(_CMAKE_SYSTEM_LINKER_TYPE STREQUAL "GNU")
include(Platform/Linker/OpenBSD-GNU-C)
else()
include(Platform/Linker/OpenBSD-LLD-C)
endif()
endblock()
@@ -3,13 +3,8 @@
include(Platform/Linker/BSD-Linker-Initialize)
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
if(_CMAKE_SYSTEM_LINKER_TYPE STREQUAL "GNU")
include(Platform/Linker/OpenBSD-GNU-CXX)
else()
include(Platform/Linker/OpenBSD-LLD-CXX)
endif()
endblock()
@@ -3,13 +3,8 @@
include(Platform/Linker/BSD-Linker-Initialize)
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
if(_CMAKE_SYSTEM_LINKER_TYPE STREQUAL "GNU")
include(Platform/Linker/OpenBSD-GNU-Fortran)
else()
include(Platform/Linker/OpenBSD-LLD-Fortran)
endif()
endblock()
@@ -5,9 +5,6 @@
# This module is shared by multiple languages; use include blocker.
include_guard()
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
macro(__sunos_linker_solaris lang)
set(CMAKE_${lang}_PLATFORM_LINKER_ID Solaris)
# Features for LINK_LIBRARY generator expression
@@ -24,5 +21,3 @@ macro(__sunos_linker_solaris lang)
set(CMAKE_${lang}_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED TRUE)
set(CMAKE_${lang}_LINK_LIBRARY_WHOLE_ARCHIVE_ATTRIBUTES LIBRARY_TYPE=STATIC DEDUPLICATION=YES OVERRIDE=DEFAULT)
endmacro()
endblock()
@@ -1,9 +1,6 @@
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
# file Copyright.txt or https://cmake.org/licensing for details.
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
if(CMAKE_ASM_SIMULATE_ID STREQUAL "MSVC")
# MSVC is the default linker
include(Platform/Linker/Windows-MSVC-ASM)
@@ -11,5 +8,3 @@ else()
# GNU is the default linker
include(Platform/Linker/Windows-GNU-ASM)
endif()
endblock()
-5
View File
@@ -1,9 +1,6 @@
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
# file Copyright.txt or https://cmake.org/licensing for details.
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
if(CMAKE_C_SIMULATE_ID STREQUAL "MSVC")
# MSVC is the default linker
include(Platform/Linker/Windows-MSVC-C)
@@ -11,5 +8,3 @@ else()
# GNU is the default linker
include(Platform/Linker/Windows-GNU-C)
endif()
endblock()
@@ -1,9 +1,6 @@
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
# file Copyright.txt or https://cmake.org/licensing for details.
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
if(CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")
# MSVC is the default linker
include(Platform/Linker/Windows-MSVC-CXX)
@@ -11,5 +8,3 @@ else()
# GNU is the default linker
include(Platform/Linker/Windows-GNU-CXX)
endif()
endblock()
@@ -1,9 +1,6 @@
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
# file Copyright.txt or https://cmake.org/licensing for details.
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
if(CMAKE_Fortran_SIMULATE_ID STREQUAL "MSVC")
# MSVC is the default linker
include(Platform/Linker/Windows-MSVC-Fortran)
@@ -11,5 +8,3 @@ else()
# GNU is the default linker
include(Platform/Linker/Windows-GNU-Fortran)
endif()
endblock()
@@ -1,9 +1,6 @@
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
# file Copyright.txt or https://cmake.org/licensing for details.
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
if(CMAKE_HIP_SIMULATE_ID STREQUAL "MSVC")
# MSVC is the default linker
include(Platform/Linker/Windows-MSVC-HIP)
@@ -11,5 +8,3 @@ else()
# GNU is the default linker
include(Platform/Linker/Windows-GNU-HIP)
endif()
endblock()
@@ -5,9 +5,6 @@
# This module is shared by multiple languages; use include blocker.
include_guard()
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
macro(__windows_linker_lld lang)
set(CMAKE_${lang}_PLATFORM_LINKER_ID LLD)
# Features for LINK_LIBRARY generator expression
@@ -21,5 +18,3 @@ macro(__windows_linker_lld lang)
__windows_linker_msvc(${lang})
endif()
endmacro()
endblock()
@@ -5,9 +5,6 @@
# This module is shared by multiple languages; use include blocker.
include_guard()
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
# Features for LINK_LIBRARY generator expression
if(MSVC_VERSION GREATER "1900")
## WHOLE_ARCHIVE: Force loading all members of an archive
@@ -32,5 +29,3 @@ macro(__windows_linker_msvc lang)
endif()
endif()
endmacro()
endblock()
@@ -1,9 +1,6 @@
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
# file Copyright.txt or https://cmake.org/licensing for details.
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
if(CMAKE_ASM_SIMULATE_ID STREQUAL "MSVC")
# MSVC is the default linker
include(Platform/Linker/WindowsPhone-MSVC-ASM)
@@ -11,5 +8,3 @@ else()
# GNU is the default linker
include(Platform/Linker/WindowsPhone-GNU-ASM)
endif()
endblock()
@@ -1,9 +1,6 @@
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
# file Copyright.txt or https://cmake.org/licensing for details.
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
if(CMAKE_C_SIMULATE_ID STREQUAL "MSVC")
# MSVC is the default linker
include(Platform/Linker/WindowsPhone-MSVC-C)
@@ -11,5 +8,3 @@ else()
# GNU is the default linker
include(Platform/Linker/WindowsPhone-GNU-C)
endif()
endblock()
@@ -1,9 +1,6 @@
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
# file Copyright.txt or https://cmake.org/licensing for details.
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
if(CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")
# MSVC is the default linker
include(Platform/Linker/WindowsPhone-MSVC-CXX)
@@ -11,5 +8,3 @@ else()
# GNU is the default linker
include(Platform/Linker/WindowsPhone-GNU-CXX)
endif()
endblock()
@@ -1,9 +1,6 @@
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
# file Copyright.txt or https://cmake.org/licensing for details.
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
if(CMAKE_ASM_SIMULATE_ID STREQUAL "MSVC")
# MSVC is the default linker
include(Platform/Linker/WindowsStore-MSVC-ASM)
@@ -11,5 +8,3 @@ else()
# GNU is the default linker
include(Platform/Linker/WindowsStore-GNU-ASM)
endif()
endblock()
@@ -1,9 +1,6 @@
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
# file Copyright.txt or https://cmake.org/licensing for details.
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
if(CMAKE_C_SIMULATE_ID STREQUAL "MSVC")
# MSVC is the default linker
include(Platform/Linker/WindowsStore-MSVC-C)
@@ -11,5 +8,3 @@ else()
# GNU is the default linker
include(Platform/Linker/WindowsStore-GNU-C)
endif()
endblock()
@@ -1,9 +1,6 @@
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
# file Copyright.txt or https://cmake.org/licensing for details.
block(SCOPE_FOR POLICIES)
cmake_policy(SET CMP0054 NEW)
if(CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")
# MSVC is the default linker
include(Platform/Linker/WindowsStore-MSVC-CXX)
@@ -11,5 +8,3 @@ else()
# GNU is the default linker
include(Platform/Linker/WindowsStore-GNU-CXX)
endif()
endblock()