mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 13:20:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

Don't include CMakeParseArguments

Browse Source 
The cmake_parse_arguments command is builtin with version 3.5.
The CMakeParseArguments module is empty and exists for backwards
compatibility with CMake 3.4 and lower.

Remove the includes of CMakeParseArguments from CMake's modules.
The modules are always used with the current version of CMake.

Leave the includes in the tests, as the tests may be run with an older
version of CMake.
This commit is contained in:
Daniel Pfeifer
2016-12-20 16:14:16 +01:00
parent 3e5fbbd6cd
commit d6877e6c40
19 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Modules/CMakeAddFortranSubdirectory.cmake
View File

@@ -45,7 +45,6 @@
set(_MS_MINGW_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}) set(_MS_MINGW_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR})
include(CheckLanguage) include(CheckLanguage)
include(ExternalProject) include(ExternalProject)
include(CMakeParseArguments)
function(_setup_mingw_config_and_build source_dir build_dir) function(_setup_mingw_config_and_build source_dir build_dir)
# Look for a MinGW gfortran. # Look for a MinGW gfortran.

2
Modules/CMakeCompilerIdDetection.cmake
View File

@@ -11,8 +11,6 @@ function(_readFile file)
set(_compiler_id_pp_test_${CompilerId} ${_compiler_id_pp_test} PARENT_SCOPE) set(_compiler_id_pp_test_${CompilerId} ${_compiler_id_pp_test} PARENT_SCOPE)
endfunction() endfunction()
include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake)
function(compiler_id_detection outvar lang) function(compiler_id_detection outvar lang)
if (NOT lang STREQUAL Fortran AND NOT lang STREQUAL CSharp) if (NOT lang STREQUAL Fortran AND NOT lang STREQUAL CSharp)

3
Modules/CMakeExpandImportedTargets.cmake
View File

@@ -37,9 +37,6 @@
# LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} # LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}
# CONFIGURATION "${CMAKE_TRY_COMPILE_CONFIGURATION}" ) # CONFIGURATION "${CMAKE_TRY_COMPILE_CONFIGURATION}" )
include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake)
function(CMAKE_EXPAND_IMPORTED_TARGETS _RESULT ) function(CMAKE_EXPAND_IMPORTED_TARGETS _RESULT )
set(options ) set(options )

3
Modules/CMakePackageConfigHelpers.cmake
View File

@@ -201,9 +201,6 @@
# #
# check_required_components(Foo) # check_required_components(Foo)
include(CMakeParseArguments)
include(WriteBasicConfigVersionFile) include(WriteBasicConfigVersionFile)
macro(WRITE_BASIC_PACKAGE_VERSION_FILE) macro(WRITE_BASIC_PACKAGE_VERSION_FILE)

2
Modules/CMakePrintHelpers.cmake
View File

@@ -39,8 +39,6 @@
# #
# -- CMAKE_C_COMPILER="/usr/bin/gcc" ; CMAKE_MAJOR_VERSION="2" ; DOES_NOT_EXIST="" # -- CMAKE_C_COMPILER="/usr/bin/gcc" ; CMAKE_MAJOR_VERSION="2" ; DOES_NOT_EXIST=""
include(CMakeParseArguments)
function(CMAKE_PRINT_VARIABLES) function(CMAKE_PRINT_VARIABLES)
set(msg "") set(msg "")
foreach(var ${ARGN}) foreach(var ${ARGN})

4
Modules/CPackIFW.cmake
View File

@@ -630,10 +630,6 @@ if(NOT CPackComponent_CMake_INCLUDED)
include(CPackComponent) include(CPackComponent)
endif() endif()
if(NOT __CMAKE_PARSE_ARGUMENTS_INCLUDED)
include(CMakeParseArguments)
endif()
# Resolve full filename for script file # Resolve full filename for script file
macro(_cpack_ifw_resolve_script _variable) macro(_cpack_ifw_resolve_script _variable)
set(_ifw_script_macro ${_variable}) set(_ifw_script_macro ${_variable})

1
Modules/CTestCoverageCollectGCOV.cmake
View File

@@ -65,7 +65,6 @@
# Suppress non-error messages that otherwise would have been # Suppress non-error messages that otherwise would have been
# printed out by this function. # printed out by this function.
include(CMakeParseArguments)
function(ctest_coverage_collect_gcov) function(ctest_coverage_collect_gcov)
set(options QUIET GLOB DELETE) set(options QUIET GLOB DELETE)
set(oneValueArgs TARBALL SOURCE BUILD GCOV_COMMAND) set(oneValueArgs TARBALL SOURCE BUILD GCOV_COMMAND)

3
Modules/FeatureSummary.cmake
View File

@@ -26,9 +26,6 @@ Functions
#]=======================================================================] #]=======================================================================]
include("${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake")
function(_FS_GET_FEATURE_SUMMARY _property _var _includeQuiet) function(_FS_GET_FEATURE_SUMMARY _property _var _includeQuiet)
set(_type "ANY") set(_type "ANY")

2
Modules/FindBISON.cmake
View File

@@ -84,8 +84,6 @@
find_program(BISON_EXECUTABLE NAMES bison win_bison DOC "path to the bison executable") find_program(BISON_EXECUTABLE NAMES bison win_bison DOC "path to the bison executable")
mark_as_advanced(BISON_EXECUTABLE) mark_as_advanced(BISON_EXECUTABLE)
include(CMakeParseArguments)
if(BISON_EXECUTABLE) if(BISON_EXECUTABLE)
# the bison commands should be executed with the C locale, otherwise # the bison commands should be executed with the C locale, otherwise
# the message (which are parsed) may be translated # the message (which are parsed) may be translated

2
Modules/FindFLEX.cmake
View File

@@ -107,8 +107,6 @@ find_path(FLEX_INCLUDE_DIR FlexLexer.h
mark_as_advanced(FL_LIBRARY FLEX_INCLUDE_DIR) mark_as_advanced(FL_LIBRARY FLEX_INCLUDE_DIR)
include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake)
set(FLEX_INCLUDE_DIRS ${FLEX_INCLUDE_DIR}) set(FLEX_INCLUDE_DIRS ${FLEX_INCLUDE_DIR})
set(FLEX_LIBRARIES ${FL_LIBRARY}) set(FLEX_LIBRARIES ${FL_LIBRARY})

1
Modules/FindGTK2.cmake
View File

@@ -165,7 +165,6 @@
#============================================================= #=============================================================
include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake)
function(_GTK2_GET_VERSION _OUT_major _OUT_minor _OUT_micro _gtkversion_hdr) function(_GTK2_GET_VERSION _OUT_major _OUT_minor _OUT_micro _gtkversion_hdr)
file(STRINGS ${_gtkversion_hdr} _contents REGEX "#define GTK_M[A-Z]+_VERSION[ \t]+") file(STRINGS ${_gtkversion_hdr} _contents REGEX "#define GTK_M[A-Z]+_VERSION[ \t]+")

2
Modules/FindGettext.cmake
View File

@@ -77,8 +77,6 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Gettext
REQUIRED_VARS GETTEXT_MSGMERGE_EXECUTABLE GETTEXT_MSGFMT_EXECUTABLE REQUIRED_VARS GETTEXT_MSGMERGE_EXECUTABLE GETTEXT_MSGFMT_EXECUTABLE
VERSION_VAR GETTEXT_VERSION_STRING) VERSION_VAR GETTEXT_VERSION_STRING)
include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake)
function(_GETTEXT_GET_UNIQUE_TARGET_NAME _name _unique_name) function(_GETTEXT_GET_UNIQUE_TARGET_NAME _name _unique_name)
set(propertyName "_GETTEXT_UNIQUE_COUNTER_${_name}") set(propertyName "_GETTEXT_UNIQUE_COUNTER_${_name}")
get_property(currentCounter GLOBAL PROPERTY "${propertyName}") get_property(currentCounter GLOBAL PROPERTY "${propertyName}")

1
Modules/FindPackageHandleStandardArgs.cmake
View File

@@ -130,7 +130,6 @@ message.
#]=======================================================================] #]=======================================================================]
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageMessage.cmake) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageMessage.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake)
# internal helper macro # internal helper macro
macro(_FPHSA_FAILURE_MESSAGE _msg) macro(_FPHSA_FAILURE_MESSAGE _msg)

3
Modules/FindSquish.cmake
View File

@@ -119,9 +119,6 @@
# #
# This is deprecated. Use SQUISH_V3_ADD_TEST() if you are using Squish 3.x instead. # This is deprecated. Use SQUISH_V3_ADD_TEST() if you are using Squish 3.x instead.
include(CMakeParseArguments)
set(SQUISH_INSTALL_DIR_STRING "Directory containing the bin, doc, and lib directories for Squish; this should be the root of the installation directory.") set(SQUISH_INSTALL_DIR_STRING "Directory containing the bin, doc, and lib directories for Squish; this should be the root of the installation directory.")
set(SQUISH_SERVER_EXECUTABLE_STRING "The squishserver executable program.") set(SQUISH_SERVER_EXECUTABLE_STRING "The squishserver executable program.")
set(SQUISH_CLIENT_EXECUTABLE_STRING "The squishclient executable program.") set(SQUISH_CLIENT_EXECUTABLE_STRING "The squishclient executable program.")

1
Modules/GenerateExportHeader.cmake
View File

@@ -184,7 +184,6 @@
# :prop_tgt:`CXX_VISIBILITY_PRESET <<LANG>_VISIBILITY_PRESET>` and # :prop_tgt:`CXX_VISIBILITY_PRESET <<LANG>_VISIBILITY_PRESET>` and
# :prop_tgt:`VISIBILITY_INLINES_HIDDEN` instead. # :prop_tgt:`VISIBILITY_INLINES_HIDDEN` instead.
include(CMakeParseArguments)
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)
# TODO: Install this macro separately? # TODO: Install this macro separately?

2
Modules/UseJava.cmake
View File

@@ -403,8 +403,6 @@
# Sets the directory where the header files will be generated. Same behavior as option # Sets the directory where the header files will be generated. Same behavior as option
# '-d' of javah tool. If not specified, ${CMAKE_CURRENT_BINARY_DIR} is used as output directory. # '-d' of javah tool. If not specified, ${CMAKE_CURRENT_BINARY_DIR} is used as output directory.
include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake)
function (__java_copy_file src dest comment) function (__java_copy_file src dest comment)
add_custom_command( add_custom_command(
OUTPUT ${dest} OUTPUT ${dest}

3
Modules/UseSWIG.cmake
View File

@@ -231,8 +231,6 @@ endmacro()
macro(SWIG_ADD_LIBRARY name) macro(SWIG_ADD_LIBRARY name)
include(CMakeParseArguments)
set(options "") set(options "")
set(oneValueArgs LANGUAGE set(oneValueArgs LANGUAGE
TYPE) TYPE)
@@ -340,4 +338,3 @@ macro(SWIG_LINK_LIBRARIES name)
message(SEND_ERROR "Cannot find Swig library \"${name}\".") message(SEND_ERROR "Cannot find Swig library \"${name}\".")
endif() endif()
endmacro() endmacro()

2
Modules/WriteBasicConfigVersionFile.cmake
View File

@@ -18,8 +18,6 @@
# #
# Deprecated, see WRITE_BASIC_PACKAGE_VERSION_FILE(), it is identical. # Deprecated, see WRITE_BASIC_PACKAGE_VERSION_FILE(), it is identical.
include(CMakeParseArguments)
function(WRITE_BASIC_CONFIG_VERSION_FILE _filename) function(WRITE_BASIC_CONFIG_VERSION_FILE _filename)
set(options ) set(options )

1
Modules/WriteCompilerDetectionHeader.cmake
View File

@@ -216,7 +216,6 @@
# CompatSupport_DEPRECATED= # CompatSupport_DEPRECATED=
# ) # )
include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/CMakeCompilerIdDetection.cmake) include(${CMAKE_CURRENT_LIST_DIR}/CMakeCompilerIdDetection.cmake)
function(_load_compiler_variables CompilerId lang) function(_load_compiler_variables CompilerId lang)