diff options
Diffstat (limited to 'host')
| -rw-r--r-- | host/cmake/Modules/CMakeParseArgumentsCopy.cmake | 138 | ||||
| -rw-r--r-- | host/cmake/Modules/CheckCXXSymbolExistsCopy.cmake | 49 | ||||
| -rw-r--r-- | host/cmake/Modules/CheckSymbolExistsCopy.cmake | 113 | ||||
| -rw-r--r-- | host/cmake/Modules/UHDComponent.cmake | 2 | ||||
| -rw-r--r-- | host/cmake/Modules/UHDGlobalDefs.cmake | 2 | 
5 files changed, 2 insertions, 302 deletions
| diff --git a/host/cmake/Modules/CMakeParseArgumentsCopy.cmake b/host/cmake/Modules/CMakeParseArgumentsCopy.cmake deleted file mode 100644 index a7e78bbdc..000000000 --- a/host/cmake/Modules/CMakeParseArgumentsCopy.cmake +++ /dev/null @@ -1,138 +0,0 @@ -# cmake_parse_arguments(<prefix> <options> <one_value_keywords> <multi_value_keywords> args...) -# -# cmake_parse_arguments() is intended to be used in macros or functions for -# parsing the arguments given to that macro or function. -# It processes the arguments and defines a set of variables which hold the -# values of the respective options. -# -# The <options> argument contains all options for the respective macro, -# i.e. keywords which can be used when calling the macro without any value -# following, like e.g. the OPTIONAL keyword of the install() command. -# -# The <one_value_keywords> argument contains all keywords for this macro -# which are followed by one value, like e.g. DESTINATION keyword of the -# install() command. -# -# The <multi_value_keywords> argument contains all keywords for this macro -# which can be followed by more than one value, like e.g. the TARGETS or -# FILES keywords of the install() command. -# -# When done, cmake_parse_arguments() will have defined for each of the -# keywords listed in <options>, <one_value_keywords> and -# <multi_value_keywords> a variable composed of the given <prefix> -# followed by "_" and the name of the respective keyword. -# These variables will then hold the respective value from the argument list. -# For the <options> keywords this will be TRUE or FALSE. -# -# All remaining arguments are collected in a variable -# <prefix>_UNPARSED_ARGUMENTS, this can be checked afterwards to see whether -# your macro was called with unrecognized parameters. -# -# As an example here a my_install() macro, which takes similar arguments as the -# real install() command: -# -#   function(MY_INSTALL) -#     set(options OPTIONAL FAST) -#     set(oneValueArgs DESTINATION RENAME) -#     set(multiValueArgs TARGETS CONFIGURATIONS) -#     cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) -#     ... -# -# Assume my_install() has been called like this: -#   my_install(TARGETS foo bar DESTINATION bin OPTIONAL blub) -# -# After the cmake_parse_arguments() call the macro will have set the following -# variables: -#   MY_INSTALL_OPTIONAL = TRUE -#   MY_INSTALL_FAST = FALSE (this option was not used when calling my_install() -#   MY_INSTALL_DESTINATION = "bin" -#   MY_INSTALL_RENAME = "" (was not used) -#   MY_INSTALL_TARGETS = "foo;bar" -#   MY_INSTALL_CONFIGURATIONS = "" (was not used) -#   MY_INSTALL_UNPARSED_ARGUMENTS = "blub" (no value expected after "OPTIONAL" -# -# You can the continue and process these variables. -# -# Keywords terminate lists of values, e.g. if directly after a one_value_keyword -# another recognized keyword follows, this is interpreted as the beginning of -# the new option. -# E.g. my_install(TARGETS foo DESTINATION OPTIONAL) would result in -# MY_INSTALL_DESTINATION set to "OPTIONAL", but MY_INSTALL_DESTINATION would -# be empty and MY_INSTALL_OPTIONAL would be set to TRUE therefor. - -#============================================================================= -# Copyright 2010 Alexander Neundorf <neundorf@kde.org> -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -#  License text for the above reference.) - - -if(__CMAKE_PARSE_ARGUMENTS_INCLUDED) -  return() -endif() -set(__CMAKE_PARSE_ARGUMENTS_INCLUDED TRUE) - - -function(CMAKE_PARSE_ARGUMENTS prefix _optionNames _singleArgNames _multiArgNames) -  # first set all result variables to empty/FALSE -  foreach(arg_name ${_singleArgNames} ${_multiArgNames}) -    set(${prefix}_${arg_name}) -  endforeach(arg_name) - -  foreach(option ${_optionNames}) -    set(${prefix}_${option} FALSE) -  endforeach(option) - -  set(${prefix}_UNPARSED_ARGUMENTS) - -  set(insideValues FALSE) -  set(currentArgName) - -  # now iterate over all arguments and fill the result variables -  foreach(currentArg ${ARGN}) -    list(FIND _optionNames "${currentArg}" optionIndex)  # ... then this marks the end of the arguments belonging to this keyword -    list(FIND _singleArgNames "${currentArg}" singleArgIndex)  # ... then this marks the end of the arguments belonging to this keyword -    list(FIND _multiArgNames "${currentArg}" multiArgIndex)  # ... then this marks the end of the arguments belonging to this keyword - -    if(${optionIndex} EQUAL -1  AND  ${singleArgIndex} EQUAL -1  AND  ${multiArgIndex} EQUAL -1) -      if(insideValues) -        if("${insideValues}" STREQUAL "SINGLE") -          set(${prefix}_${currentArgName} ${currentArg}) -          set(insideValues FALSE) -        elseif("${insideValues}" STREQUAL "MULTI") -          list(APPEND ${prefix}_${currentArgName} ${currentArg}) -        endif() -      else(insideValues) -        list(APPEND ${prefix}_UNPARSED_ARGUMENTS ${currentArg}) -      endif(insideValues) -    else() -      if(NOT ${optionIndex} EQUAL -1) -        set(${prefix}_${currentArg} TRUE) -        set(insideValues FALSE) -      elseif(NOT ${singleArgIndex} EQUAL -1) -        set(currentArgName ${currentArg}) -        set(${prefix}_${currentArgName}) -        set(insideValues "SINGLE") -      elseif(NOT ${multiArgIndex} EQUAL -1) -        set(currentArgName ${currentArg}) -        set(${prefix}_${currentArgName}) -        set(insideValues "MULTI") -      endif() -    endif() - -  endforeach(currentArg) - -  # propagate the result variables to the caller: -  foreach(arg_name ${_singleArgNames} ${_multiArgNames} ${_optionNames}) -    set(${prefix}_${arg_name}  ${${prefix}_${arg_name}} PARENT_SCOPE) -  endforeach(arg_name) -  set(${prefix}_UNPARSED_ARGUMENTS ${${prefix}_UNPARSED_ARGUMENTS} PARENT_SCOPE) - -endfunction(CMAKE_PARSE_ARGUMENTS _options _singleArgs _multiArgs) diff --git a/host/cmake/Modules/CheckCXXSymbolExistsCopy.cmake b/host/cmake/Modules/CheckCXXSymbolExistsCopy.cmake deleted file mode 100644 index 2f16ba677..000000000 --- a/host/cmake/Modules/CheckCXXSymbolExistsCopy.cmake +++ /dev/null @@ -1,49 +0,0 @@ -#.rst: -# CheckCXXSymbolExists -# -------------------- -# -# Check if a symbol exists as a function, variable, or macro in C++ -# -# CHECK_CXX_SYMBOL_EXISTS(<symbol> <files> <variable>) -# -# Check that the <symbol> is available after including given header -# <files> and store the result in a <variable>.  Specify the list of -# files in one argument as a semicolon-separated list. -# CHECK_CXX_SYMBOL_EXISTS() can be used to check in C++ files, as -# opposed to CHECK_SYMBOL_EXISTS(), which works only for C. -# -# If the header files define the symbol as a macro it is considered -# available and assumed to work.  If the header files declare the symbol -# as a function or variable then the symbol must also be available for -# linking.  If the symbol is a type or enum value it will not be -# recognized (consider using CheckTypeSize or CheckCSourceCompiles). -# -# The following variables may be set before calling this macro to modify -# the way the check is run: -# -# :: -# -#   CMAKE_REQUIRED_FLAGS = string of compile command line flags -#   CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar) -#   CMAKE_REQUIRED_INCLUDES = list of include directories -#   CMAKE_REQUIRED_LIBRARIES = list of libraries to link -#   CMAKE_REQUIRED_QUIET = execute quietly without messages - -#============================================================================= -# Copyright 2003-2011 Kitware, Inc. -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -#  License text for the above reference.) - -include(CheckSymbolExistsCopy) - -macro(CHECK_CXX_SYMBOL_EXISTS SYMBOL FILES VARIABLE) -  _CHECK_SYMBOL_EXISTS("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx" "${SYMBOL}" "${FILES}" "${VARIABLE}" ) -endmacro() diff --git a/host/cmake/Modules/CheckSymbolExistsCopy.cmake b/host/cmake/Modules/CheckSymbolExistsCopy.cmake deleted file mode 100644 index 79c5ba78e..000000000 --- a/host/cmake/Modules/CheckSymbolExistsCopy.cmake +++ /dev/null @@ -1,113 +0,0 @@ -#.rst: -# CheckSymbolExists -# ----------------- -# -# Check if a symbol exists as a function, variable, or macro -# -# CHECK_SYMBOL_EXISTS(<symbol> <files> <variable>) -# -# Check that the <symbol> is available after including given header -# <files> and store the result in a <variable>.  Specify the list of -# files in one argument as a semicolon-separated list. -# <variable> will be created as an internal cache variable. -# -# If the header files define the symbol as a macro it is considered -# available and assumed to work.  If the header files declare the symbol -# as a function or variable then the symbol must also be available for -# linking.  If the symbol is a type or enum value it will not be -# recognized (consider using CheckTypeSize or CheckCSourceCompiles).  If -# the check needs to be done in C++, consider using -# CHECK_CXX_SYMBOL_EXISTS(), which does the same as -# CHECK_SYMBOL_EXISTS(), but in C++. -# -# The following variables may be set before calling this macro to modify -# the way the check is run: -# -# :: -# -#   CMAKE_REQUIRED_FLAGS = string of compile command line flags -#   CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar) -#   CMAKE_REQUIRED_INCLUDES = list of include directories -#   CMAKE_REQUIRED_LIBRARIES = list of libraries to link -#   CMAKE_REQUIRED_QUIET = execute quietly without messages - -#============================================================================= -# Copyright 2003-2011 Kitware, Inc. -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -#  License text for the above reference.) - - - -macro(CHECK_SYMBOL_EXISTS SYMBOL FILES VARIABLE) -  _CHECK_SYMBOL_EXISTS("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.c" "${SYMBOL}" "${FILES}" "${VARIABLE}" ) -endmacro() - -macro(_CHECK_SYMBOL_EXISTS SOURCEFILE SYMBOL FILES VARIABLE) -  if(NOT DEFINED "${VARIABLE}" OR "x${${VARIABLE}}" STREQUAL "x${VARIABLE}") -    set(CMAKE_CONFIGURABLE_FILE_CONTENT "/* */\n") -    set(MACRO_CHECK_SYMBOL_EXISTS_FLAGS ${CMAKE_REQUIRED_FLAGS}) -    if(CMAKE_REQUIRED_LIBRARIES) -      set(CHECK_SYMBOL_EXISTS_LIBS -        LINK_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}) -    else() -      set(CHECK_SYMBOL_EXISTS_LIBS) -    endif() -    if(CMAKE_REQUIRED_INCLUDES) -      set(CMAKE_SYMBOL_EXISTS_INCLUDES -        "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}") -    else() -      set(CMAKE_SYMBOL_EXISTS_INCLUDES) -    endif() -    foreach(FILE ${FILES}) -      set(CMAKE_CONFIGURABLE_FILE_CONTENT -        "${CMAKE_CONFIGURABLE_FILE_CONTENT}#include <${FILE}>\n") -    endforeach() -    set(CMAKE_CONFIGURABLE_FILE_CONTENT -      "${CMAKE_CONFIGURABLE_FILE_CONTENT}\nint main(int argc, char** argv)\n{\n  (void)argv;\n#ifndef ${SYMBOL}\n  return ((int*)(&${SYMBOL}))[argc];\n#else\n  (void)argc;\n  return 0;\n#endif\n}\n") - -    configure_file("${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in" -      "${SOURCEFILE}" @ONLY) - -    if(NOT CMAKE_REQUIRED_QUIET) -      message(STATUS "Looking for ${SYMBOL}") -    endif() -    try_compile(${VARIABLE} -      ${CMAKE_BINARY_DIR} -      "${SOURCEFILE}" -      COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -      ${CHECK_SYMBOL_EXISTS_LIBS} -      CMAKE_FLAGS -      -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_SYMBOL_EXISTS_FLAGS} -      "${CMAKE_SYMBOL_EXISTS_INCLUDES}" -      OUTPUT_VARIABLE OUTPUT) -    if(${VARIABLE}) -      if(NOT CMAKE_REQUIRED_QUIET) -        message(STATUS "Looking for ${SYMBOL} - found") -      endif() -      set(${VARIABLE} 1 CACHE INTERNAL "Have symbol ${SYMBOL}") -      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log -        "Determining if the ${SYMBOL} " -        "exist passed with the following output:\n" -        "${OUTPUT}\nFile ${SOURCEFILE}:\n" -        "${CMAKE_CONFIGURABLE_FILE_CONTENT}\n") -    else() -      if(NOT CMAKE_REQUIRED_QUIET) -        message(STATUS "Looking for ${SYMBOL} - not found") -      endif() -      set(${VARIABLE} "" CACHE INTERNAL "Have symbol ${SYMBOL}") -      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log -        "Determining if the ${SYMBOL} " -        "exist failed with the following output:\n" -        "${OUTPUT}\nFile ${SOURCEFILE}:\n" -        "${CMAKE_CONFIGURABLE_FILE_CONTENT}\n") -    endif() -  endif() -endmacro() diff --git a/host/cmake/Modules/UHDComponent.cmake b/host/cmake/Modules/UHDComponent.cmake index db8806be9..c85cc0fa1 100644 --- a/host/cmake/Modules/UHDComponent.cmake +++ b/host/cmake/Modules/UHDComponent.cmake @@ -78,7 +78,7 @@ endmacro(LIBUHD_REGISTER_COMPONENT)  # Install only if appropriate for package and if component is enabled  ########################################################################  function(UHD_INSTALL) -    include(CMakeParseArgumentsCopy) +    include(CMakeParseArguments)      cmake_parse_arguments(UHD_INSTALL "" "DESTINATION;COMPONENT" "TARGETS;FILES;PROGRAMS" ${ARGN})      if(UHD_INSTALL_FILES) diff --git a/host/cmake/Modules/UHDGlobalDefs.cmake b/host/cmake/Modules/UHDGlobalDefs.cmake index 385679258..a10d256b5 100644 --- a/host/cmake/Modules/UHDGlobalDefs.cmake +++ b/host/cmake/Modules/UHDGlobalDefs.cmake @@ -7,7 +7,7 @@  # This file sets up all the stuff for the config.h file -include(CheckCXXSymbolExistsCopy) +include(CheckCXXSymbolExists)  ## Macros for the version number  if(UHD_VERSION_DEVEL) | 
