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!) --- mpm/cmake/Modules/MPMVersion.cmake | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'mpm/cmake/Modules/MPMVersion.cmake') 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() -- cgit v1.2.3