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/include/CMakeLists.txt | 8 ++++---- host/include/uhd/CMakeLists.txt | 24 ++++++++++++------------ host/include/uhd/rfnoc/CMakeLists.txt | 8 ++++---- host/include/uhd/rfnoc/blocks/CMakeLists.txt | 2 +- host/include/uhd/types/CMakeLists.txt | 4 ++-- host/include/uhd/usrp/CMakeLists.txt | 4 ++-- host/include/uhd/usrp_clock/CMakeLists.txt | 4 ++-- host/include/uhd/utils/CMakeLists.txt | 4 ++-- 8 files changed, 29 insertions(+), 29 deletions(-) (limited to 'host/include') diff --git a/host/include/CMakeLists.txt b/host/include/CMakeLists.txt index 0efed9785..f46870dc2 100644 --- a/host/include/CMakeLists.txt +++ b/host/include/CMakeLists.txt @@ -5,16 +5,16 @@ # SPDX-License-Identifier: GPL-3.0 # -CONFIGURE_FILE( +configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h ) -IF(ENABLE_C_API) +if(ENABLE_C_API) UHD_INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/uhd.h DESTINATION ${INCLUDE_DIR} COMPONENT headers ) -ENDIF(ENABLE_C_API) +endif(ENABLE_C_API) -ADD_SUBDIRECTORY(uhd) +add_subdirectory(uhd) diff --git a/host/include/uhd/CMakeLists.txt b/host/include/uhd/CMakeLists.txt index e0599fd82..b184fb30d 100644 --- a/host/include/uhd/CMakeLists.txt +++ b/host/include/uhd/CMakeLists.txt @@ -5,15 +5,15 @@ # SPDX-License-Identifier: GPL-3.0 # -ADD_SUBDIRECTORY(rfnoc) -ADD_SUBDIRECTORY(transport) -ADD_SUBDIRECTORY(types) -ADD_SUBDIRECTORY(cal) -ADD_SUBDIRECTORY(usrp) -ADD_SUBDIRECTORY(usrp_clock) -ADD_SUBDIRECTORY(utils) +add_subdirectory(rfnoc) +add_subdirectory(transport) +add_subdirectory(types) +add_subdirectory(cal) +add_subdirectory(usrp) +add_subdirectory(usrp_clock) +add_subdirectory(utils) -CONFIGURE_FILE( +configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/version.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/version.hpp ) @@ -33,19 +33,19 @@ UHD_INSTALL(FILES COMPONENT headers ) -IF(ENABLE_RFNOC) +if(ENABLE_RFNOC) UHD_INSTALL(FILES device3.hpp DESTINATION ${INCLUDE_DIR}/uhd COMPONENT headers ) -ENDIF(ENABLE_RFNOC) +endif(ENABLE_RFNOC) -IF(ENABLE_C_API) +if(ENABLE_C_API) UHD_INSTALL(FILES config.h error.h DESTINATION ${INCLUDE_DIR}/uhd COMPONENT headers ) -ENDIF(ENABLE_C_API) +endif(ENABLE_C_API) diff --git a/host/include/uhd/rfnoc/CMakeLists.txt b/host/include/uhd/rfnoc/CMakeLists.txt index 981a32c98..67b629acb 100644 --- a/host/include/uhd/rfnoc/CMakeLists.txt +++ b/host/include/uhd/rfnoc/CMakeLists.txt @@ -5,7 +5,7 @@ # SPDX-License-Identifier: GPL-3.0 # -IF(ENABLE_RFNOC) +if(ENABLE_RFNOC) UHD_INSTALL(FILES # Infrastructure block_ctrl_base.hpp @@ -38,8 +38,8 @@ IF(ENABLE_RFNOC) DESTINATION ${INCLUDE_DIR}/uhd/rfnoc COMPONENT headers ) -ENDIF(ENABLE_RFNOC) +endif(ENABLE_RFNOC) -ADD_SUBDIRECTORY(blocks) -#ADD_SUBDIRECTORY(components) +add_subdirectory(blocks) +#add_subdirectory(components) diff --git a/host/include/uhd/rfnoc/blocks/CMakeLists.txt b/host/include/uhd/rfnoc/blocks/CMakeLists.txt index 027b6eb53..d694517c6 100644 --- a/host/include/uhd/rfnoc/blocks/CMakeLists.txt +++ b/host/include/uhd/rfnoc/blocks/CMakeLists.txt @@ -5,7 +5,7 @@ # SPDX-License-Identifier: GPL-3.0 # -FILE(GLOB xml_files "*.xml") +file(GLOB xml_files "*.xml") # We always need this, even when RFNoC is 'disabled' UHD_INSTALL( diff --git a/host/include/uhd/types/CMakeLists.txt b/host/include/uhd/types/CMakeLists.txt index d9f28b08c..516459e01 100644 --- a/host/include/uhd/types/CMakeLists.txt +++ b/host/include/uhd/types/CMakeLists.txt @@ -33,7 +33,7 @@ UHD_INSTALL(FILES COMPONENT headers ) -IF(ENABLE_C_API) +if(ENABLE_C_API) UHD_INSTALL(FILES metadata.h ranges.h @@ -45,4 +45,4 @@ IF(ENABLE_C_API) DESTINATION ${INCLUDE_DIR}/uhd/types COMPONENT headers ) -ENDIF(ENABLE_C_API) +endif(ENABLE_C_API) diff --git a/host/include/uhd/usrp/CMakeLists.txt b/host/include/uhd/usrp/CMakeLists.txt index abc159d8f..2c80ed59f 100644 --- a/host/include/uhd/usrp/CMakeLists.txt +++ b/host/include/uhd/usrp/CMakeLists.txt @@ -28,7 +28,7 @@ UHD_INSTALL(FILES COMPONENT headers ) -IF(ENABLE_C_API) +if(ENABLE_C_API) UHD_INSTALL(FILES dboard_eeprom.h mboard_eeprom.h @@ -37,4 +37,4 @@ IF(ENABLE_C_API) DESTINATION ${INCLUDE_DIR}/uhd/usrp COMPONENT headers ) -ENDIF(ENABLE_C_API) +endif(ENABLE_C_API) diff --git a/host/include/uhd/usrp_clock/CMakeLists.txt b/host/include/uhd/usrp_clock/CMakeLists.txt index 5bb2499b2..f45770d03 100644 --- a/host/include/uhd/usrp_clock/CMakeLists.txt +++ b/host/include/uhd/usrp_clock/CMakeLists.txt @@ -12,10 +12,10 @@ UHD_INSTALL(FILES COMPONENT headers ) -IF(ENABLE_C_API) +if(ENABLE_C_API) UHD_INSTALL(FILES usrp_clock.h DESTINATION ${INCLUDE_DIR}/uhd/usrp_clock COMPONENT headers ) -ENDIF(ENABLE_C_API) +endif(ENABLE_C_API) diff --git a/host/include/uhd/utils/CMakeLists.txt b/host/include/uhd/utils/CMakeLists.txt index 9c2fed964..7f45df1d3 100644 --- a/host/include/uhd/utils/CMakeLists.txt +++ b/host/include/uhd/utils/CMakeLists.txt @@ -33,11 +33,11 @@ UHD_INSTALL(FILES COMPONENT headers ) -IF(ENABLE_C_API) +if(ENABLE_C_API) UHD_INSTALL(FILES thread_priority.h log.h DESTINATION ${INCLUDE_DIR}/uhd/utils COMPONENT headers ) -ENDIF(ENABLE_C_API) +endif(ENABLE_C_API) -- cgit v1.2.3