diff options
author | Martin Braun <martin.braun@ettus.com> | 2018-11-13 21:53:22 -0800 |
---|---|---|
committer | Brent Stapleton <bstapleton@g.hmc.edu> | 2018-11-14 14:10:09 -0800 |
commit | a69ab0c23a0c38e3fed3e412df36538d8959d23c (patch) | |
tree | e6669a138dad84f79c46588f43a38c69dda90246 /mpm/cmake/Modules | |
parent | 4247f025020d7dd1f696dfbd3cce248957d6ace7 (diff) | |
download | uhd-a69ab0c23a0c38e3fed3e412df36538d8959d23c.tar.gz uhd-a69ab0c23a0c38e3fed3e412df36538d8959d23c.tar.bz2 uhd-a69ab0c23a0c38e3fed3e412df36538d8959d23c.zip |
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!)
Diffstat (limited to 'mpm/cmake/Modules')
-rw-r--r-- | mpm/cmake/Modules/MPMComponent.cmake | 116 | ||||
-rw-r--r-- | mpm/cmake/Modules/MPMVersion.cmake | 34 |
2 files changed, 75 insertions, 75 deletions
diff --git a/mpm/cmake/Modules/MPMComponent.cmake b/mpm/cmake/Modules/MPMComponent.cmake index fefcc5d65..461d95185 100644 --- a/mpm/cmake/Modules/MPMComponent.cmake +++ b/mpm/cmake/Modules/MPMComponent.cmake @@ -5,8 +5,8 @@ # ######################################################################## -SET(_mpm_enabled_components "" CACHE INTERNAL "" FORCE) -SET(_mpm_disabled_components "" CACHE INTERNAL "" FORCE) +set(_mpm_enabled_components "" CACHE INTERNAL "" FORCE) +set(_mpm_disabled_components "" CACHE INTERNAL "" FORCE) ######################################################################## # Register a component into the system @@ -21,36 +21,36 @@ SET(_mpm_disabled_components "" CACHE INTERNAL "" FORCE) # "FOO" which is enabled by calling CMake with -DENABLE_FOO=ON. It defaults to # ON, unless DEPENDENCY_FOUND is false, in which case it becomes false. ######################################################################## -MACRO(MPM_REGISTER_COMPONENT name var enb deps dis req) - MESSAGE(STATUS "") - MESSAGE(STATUS "Configuring ${name} support...") - FOREACH(dep ${deps}) - MESSAGE(STATUS " Dependency ${dep} = ${${dep}}") - ENDFOREACH(dep) +macro(MPM_REGISTER_COMPONENT name var enb deps dis req) + message(STATUS "") + message(STATUS "Configuring ${name} support...") + foreach(dep ${deps}) + message(STATUS " Dependency ${dep} = ${${dep}}") + endforeach(dep) # If user specified option, store here. Note: If the user doesn't specify # this option on the cmake command line, both user_enabled and # user_disabled will be false! - IF("${${var}}" STREQUAL "OFF") - SET(user_disabled TRUE) - ELSE() - SET(user_disabled FALSE) - ENDIF("${${var}}" STREQUAL "OFF") - IF("${${var}}" STREQUAL "ON") - SET(user_enabled TRUE) - ELSE() - SET(user_enabled FALSE) - ENDIF("${${var}}" STREQUAL "ON") + if("${${var}}" STREQUAL "OFF") + set(user_disabled TRUE) + else() + set(user_disabled FALSE) + endif("${${var}}" STREQUAL "OFF") + if("${${var}}" STREQUAL "ON") + set(user_enabled TRUE) + else() + set(user_enabled FALSE) + endif("${${var}}" STREQUAL "ON") # Override default if user set - IF(user_enabled OR user_disabled) - SET(option "${${var}}") - ELSE(user_enabled OR user_disabled) - SET(option ${req}) - ENDIF() + if(user_enabled OR user_disabled) + set(option "${${var}}") + else(user_enabled OR user_disabled) + set(option ${req}) + endif() # setup the dependent option for this component - INCLUDE(CMakeDependentOption) + include(CMakeDependentOption) CMAKE_DEPENDENT_OPTION(${var} "enable ${name} support" ${option} "${deps}" ${dis}) # There are two failure cases: @@ -58,47 +58,47 @@ MACRO(MPM_REGISTER_COMPONENT name var enb deps dis req) # requirements are not met. # 2) The user did not explicitly turn off this component (-DENABLE_FOO=OFF) # but it is flagged as required by ${req} - IF(NOT ${var} AND user_enabled) # Case 1) - MESSAGE(FATAL_ERROR "Dependencies for required component ${name} not met.") - ENDIF(NOT ${var} AND user_enabled) - IF(NOT ${var} AND ${req} AND NOT user_disabled) # Case 2) - MESSAGE(FATAL_ERROR "Dependencies for required component ${name} not met.") - ENDIF(NOT ${var} AND ${req} AND NOT user_disabled) + if(NOT ${var} AND user_enabled) # Case 1) + message(FATAL_ERROR "Dependencies for required component ${name} not met.") + endif(NOT ${var} AND user_enabled) + if(NOT ${var} AND ${req} AND NOT user_disabled) # Case 2) + message(FATAL_ERROR "Dependencies for required component ${name} not met.") + endif(NOT ${var} AND ${req} AND NOT user_disabled) #append the component into one of the lists - IF(${var}) - MESSAGE(STATUS " Enabling ${name} support.") - LIST(APPEND _mpm_enabled_components ${name}) - ELSE(${var}) - MESSAGE(STATUS " Disabling ${name} support.") - LIST(APPEND _mpm_disabled_components ${name}) - ENDIF(${var}) - MESSAGE(STATUS " Override with -D${var}=ON/OFF") + if(${var}) + message(STATUS " Enabling ${name} support.") + list(APPEND _mpm_enabled_components ${name}) + else(${var}) + message(STATUS " Disabling ${name} support.") + list(APPEND _mpm_disabled_components ${name}) + endif(${var}) + message(STATUS " Override with -D${var}=ON/OFF") #make components lists into global variables - SET(_mpm_enabled_components ${_uhd_enabled_components} CACHE INTERNAL "" FORCE) - SET(_mpm_disabled_components ${_uhd_disabled_components} CACHE INTERNAL "" FORCE) -ENDMACRO(MPM_REGISTER_COMPONENT) + set(_mpm_enabled_components ${_uhd_enabled_components} CACHE INTERNAL "" FORCE) + set(_mpm_disabled_components ${_uhd_disabled_components} CACHE INTERNAL "" FORCE) +endmacro(MPM_REGISTER_COMPONENT) ######################################################################## # Print the registered component summary ######################################################################## -FUNCTION(MPM_PRINT_COMPONENT_SUMMARY) - MESSAGE(STATUS "") - MESSAGE(STATUS "######################################################") - MESSAGE(STATUS "# MPM enabled components ") - MESSAGE(STATUS "######################################################") - FOREACH(comp ${_mpm_enabled_components}) - MESSAGE(STATUS " * ${comp}") - ENDFOREACH(comp) +function(MPM_PRINT_COMPONENT_SUMMARY) + message(STATUS "") + message(STATUS "######################################################") + message(STATUS "# MPM enabled components ") + message(STATUS "######################################################") + foreach(comp ${_mpm_enabled_components}) + message(STATUS " * ${comp}") + endforeach(comp) - MESSAGE(STATUS "") - MESSAGE(STATUS "######################################################") - MESSAGE(STATUS "# MPM disabled components ") - MESSAGE(STATUS "######################################################") - FOREACH(comp ${_mpm_disabled_components}) - MESSAGE(STATUS " * ${comp}") - ENDFOREACH(comp) + message(STATUS "") + message(STATUS "######################################################") + message(STATUS "# MPM disabled components ") + message(STATUS "######################################################") + foreach(comp ${_mpm_disabled_components}) + message(STATUS " * ${comp}") + endforeach(comp) - MESSAGE(STATUS "") -ENDFUNCTION(MPM_PRINT_COMPONENT_SUMMARY) + message(STATUS "") +endfunction(MPM_PRINT_COMPONENT_SUMMARY) diff --git a/mpm/cmake/Modules/MPMVersion.cmake b/mpm/cmake/Modules/MPMVersion.cmake index dfe22efb2..622892417 100644 --- a/mpm/cmake/Modules/MPMVersion.cmake +++ b/mpm/cmake/Modules/MPMVersion.cmake @@ -6,26 +6,26 @@ # -INCLUDE(UHDVersion) +include(UHDVersion) ############################################################################### # Set all version info equivalent to UHD versions ############################################################################### -SET(MPM_VERSION_MAJOR ${UHD_VERSION_MAJOR}) -SET(MPM_VERSION_API ${UHD_VERSION_API}) -SET(MPM_VERSION_ABI ${UHD_VERSION_ABI}) -SET(MPM_VERSION_PATCH ${UHD_VERSION_PATCH}) -SET(MPM_VERSION_DEVEL ${UHD_VERSION_DEVEL}) -SET(MPM_GIT_BRANCH ${UHD_GIT_BRANCH}) -SET(MPM_GIT_COUNT ${UHD_GIT_COUNT}) -SET(MPM_GIT_HASH ${UHD_GIT_HASH}) -STRING(REPLACE "g" "" MPM_GIT_HASH_RAW ${UHD_GIT_HASH}) +set(MPM_VERSION_MAJOR ${UHD_VERSION_MAJOR}) +set(MPM_VERSION_API ${UHD_VERSION_API}) +set(MPM_VERSION_ABI ${UHD_VERSION_ABI}) +set(MPM_VERSION_PATCH ${UHD_VERSION_PATCH}) +set(MPM_VERSION_DEVEL ${UHD_VERSION_DEVEL}) +set(MPM_GIT_BRANCH ${UHD_GIT_BRANCH}) +set(MPM_GIT_COUNT ${UHD_GIT_COUNT}) +set(MPM_GIT_HASH ${UHD_GIT_HASH}) +string(REPLACE "g" "" MPM_GIT_HASH_RAW ${UHD_GIT_HASH}) -IF(DEFINED MPM_VERSION) - SET(MPM_VERSION "${MPM_VERSION}" CACHE STRING "Set MPM_VERSION to a custom value") -ELSEIF(TRIM_UHD_VERSION STREQUAL "True") - SET(MPM_VERSION "${MPM_VERSION_MAJOR}.${MPM_VERSION_API}.${MPM_VERSION_ABI}.${MPM_VERSION_PATCH}-${MPM_GIT_HASH}") -ELSE() - SET(MPM_VERSION "${MPM_VERSION_MAJOR}.${MPM_VERSION_API}.${MPM_VERSION_ABI}.${MPM_VERSION_PATCH}-${MPM_GIT_COUNT}-${MPM_GIT_HASH}") -ENDIF() +if(DEFINED MPM_VERSION) + set(MPM_VERSION "${MPM_VERSION}" CACHE STRING "Set MPM_VERSION to a custom value") +elseif(TRIM_UHD_VERSION STREQUAL "True") + set(MPM_VERSION "${MPM_VERSION_MAJOR}.${MPM_VERSION_API}.${MPM_VERSION_ABI}.${MPM_VERSION_PATCH}-${MPM_GIT_HASH}") +else() + set(MPM_VERSION "${MPM_VERSION_MAJOR}.${MPM_VERSION_API}.${MPM_VERSION_ABI}.${MPM_VERSION_PATCH}-${MPM_GIT_COUNT}-${MPM_GIT_HASH}") +endif() |