From a69ab0c23a0c38e3fed3e412df36538d8959d23c Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Tue, 13 Nov 2018 21:53:22 -0800 Subject: cmake: Update coding style to use lowercase commands Also updates our coding style file. Ancient CMake versions required upper-case commands. Later command names became case-insensitive. Now the preferred style is lower-case. Run the following shell code (with GNU compliant sed): cmake --help-command-list | grep -v "cmake version" | while read c; do echo 's/\b'"$(echo $c | tr '[:lower:]' '[:upper:]')"'\(\s*\)(/'"$c"'\1(/g' done > convert.sed \ && git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' \ '*CMakeLists.txt' | xargs -0 gsed -i -f convert.sed && rm convert.sed (Make sure the backslashes don't get mangled!) --- host/cmake/Modules/UHDPython.cmake | 96 +++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 48 deletions(-) (limited to 'host/cmake/Modules/UHDPython.cmake') diff --git a/host/cmake/Modules/UHDPython.cmake b/host/cmake/Modules/UHDPython.cmake index f8f3686c8..fb5874ada 100644 --- a/host/cmake/Modules/UHDPython.cmake +++ b/host/cmake/Modules/UHDPython.cmake @@ -5,58 +5,58 @@ # SPDX-License-Identifier: GPL-3.0-or-later # -IF(NOT DEFINED INCLUDED_UHD_PYTHON_CMAKE) -SET(INCLUDED_UHD_PYTHON_CMAKE TRUE) +if(NOT DEFINED INCLUDED_UHD_PYTHON_CMAKE) +set(INCLUDED_UHD_PYTHON_CMAKE TRUE) ######################################################################## # Setup Python ######################################################################## -MESSAGE(STATUS "") -MESSAGE(STATUS "Configuring the python interpreter...") +message(STATUS "") +message(STATUS "Configuring the python interpreter...") #this allows the user to override PYTHON_EXECUTABLE -IF(PYTHON_EXECUTABLE) +if(PYTHON_EXECUTABLE) - SET(PYTHONINTERP_FOUND TRUE) + set(PYTHONINTERP_FOUND TRUE) #otherwise if not set, try to automatically find it -ELSE(PYTHON_EXECUTABLE) +else(PYTHON_EXECUTABLE) #use the built-in find script - IF(ENABLE_PYTHON3) - FIND_PACKAGE(PythonInterp 3.0) - ELSE(ENABLE_PYTHON3) - FIND_PACKAGE(PythonInterp 2.0) - ENDIF(ENABLE_PYTHON3) + if(ENABLE_PYTHON3) + find_package(PythonInterp 3.0) + else(ENABLE_PYTHON3) + find_package(PythonInterp 2.0) + endif(ENABLE_PYTHON3) #and if that fails use the find program routine - IF(NOT PYTHONINTERP_FOUND) - IF(ENABLE_PYTHON3) - FIND_PROGRAM(PYTHON_EXECUTABLE NAMES python3 python3.5 python3.6) - ELSE(ENABLE_PYTHON3) - FIND_PROGRAM(PYTHON_EXECUTABLE NAMES python2 python2.7) - ENDIF(ENABLE_PYTHON3) + if(NOT PYTHONINTERP_FOUND) + if(ENABLE_PYTHON3) + find_program(PYTHON_EXECUTABLE NAMES python3 python3.5 python3.6) + else(ENABLE_PYTHON3) + find_program(PYTHON_EXECUTABLE NAMES python2 python2.7) + endif(ENABLE_PYTHON3) - IF(PYTHON_EXECUTABLE) - SET(PYTHONINTERP_FOUND TRUE) - ENDIF(PYTHON_EXECUTABLE) - ENDIF(NOT PYTHONINTERP_FOUND) + if(PYTHON_EXECUTABLE) + set(PYTHONINTERP_FOUND TRUE) + endif(PYTHON_EXECUTABLE) + endif(NOT PYTHONINTERP_FOUND) -ENDIF(PYTHON_EXECUTABLE) +endif(PYTHON_EXECUTABLE) #make the path to the executable appear in the cmake gui -SET(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE} CACHE FILEPATH "python interpreter") +set(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE} CACHE FILEPATH "python interpreter") -MESSAGE(STATUS "Python interpreter: ${PYTHON_EXECUTABLE}") -MESSAGE(STATUS "Override with: -DPYTHON_EXECUTABLE=") +message(STATUS "Python interpreter: ${PYTHON_EXECUTABLE}") +message(STATUS "Override with: -DPYTHON_EXECUTABLE=") -IF(NOT PYTHONINTERP_FOUND) - MESSAGE(FATAL_ERROR "Error: Python interpreter required by the build system.") -ENDIF(NOT PYTHONINTERP_FOUND) +if(NOT PYTHONINTERP_FOUND) + message(FATAL_ERROR "Error: Python interpreter required by the build system.") +endif(NOT PYTHONINTERP_FOUND) -MACRO(PYTHON_CHECK_MODULE desc mod cmd have) - MESSAGE(STATUS "") - MESSAGE(STATUS "Python checking for ${desc}") - EXECUTE_PROCESS( +macro(PYTHON_CHECK_MODULE desc mod cmd have) + message(STATUS "") + message(STATUS "Python checking for ${desc}") + execute_process( COMMAND ${PYTHON_EXECUTABLE} -c " ######################################### from distutils.version import LooseVersion @@ -68,19 +68,19 @@ exit(0) #########################################" RESULT_VARIABLE ${have} ) - IF(${have} EQUAL 0) - MESSAGE(STATUS "Python checking for ${desc} - found") - SET(${have} TRUE) - ELSEIF(${have} EQUAL 1) - MESSAGE(STATUS "Python checking for ${desc} - \"import ${mod}\" failed") - SET(${have} FALSE) - ELSEIF(${have} EQUAL 2) - MESSAGE(STATUS "Python checking for ${desc} - \"assert ${cmd}\" failed") - SET(${have} FALSE) - ELSE() - MESSAGE(STATUS "Python checking for ${desc} - unknown error") - SET(${have} FALSE) - ENDIF() -ENDMACRO(PYTHON_CHECK_MODULE) + if(${have} EQUAL 0) + message(STATUS "Python checking for ${desc} - found") + set(${have} TRUE) + elseif(${have} EQUAL 1) + message(STATUS "Python checking for ${desc} - \"import ${mod}\" failed") + set(${have} FALSE) + elseif(${have} EQUAL 2) + message(STATUS "Python checking for ${desc} - \"assert ${cmd}\" failed") + set(${have} FALSE) + else() + message(STATUS "Python checking for ${desc} - unknown error") + set(${have} FALSE) + endif() +endmacro(PYTHON_CHECK_MODULE) -ENDIF(NOT DEFINED INCLUDED_UHD_PYTHON_CMAKE) +endif(NOT DEFINED INCLUDED_UHD_PYTHON_CMAKE) -- cgit v1.2.3