Change in gr-gsm[master]: cmake: make formatting of install statements follow one pattern

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

ptrkrysik gerrit-no-reply at lists.osmocom.org
Mon May 3 10:24:54 UTC 2021


ptrkrysik has uploaded this change for review. ( https://gerrit.osmocom.org/c/gr-gsm/+/24096 )


Change subject: cmake: make formatting of install statements follow one pattern
......................................................................

cmake: make formatting of install statements follow one pattern

Change-Id: Ib7d571af629b0af78397a411b0cca409a6d218d8
---
M CMakeLists.txt
M apps/apps_data/CMakeLists.txt
M docs/CMakeLists.txt
M docs/doxygen/CMakeLists.txt
M grc/CMakeLists.txt
M grc/decoding/CMakeLists.txt
M grc/decryption/CMakeLists.txt
M grc/demapping/CMakeLists.txt
M grc/flow_control/CMakeLists.txt
M grc/misc_utils/CMakeLists.txt
M grc/qa_utils/CMakeLists.txt
M grc/receiver/CMakeLists.txt
M grc/transmitter/CMakeLists.txt
M grc/trx/CMakeLists.txt
M include/grgsm/CMakeLists.txt
M include/grgsm/decoding/CMakeLists.txt
M include/grgsm/decryption/CMakeLists.txt
M include/grgsm/demapping/CMakeLists.txt
M include/grgsm/flow_control/CMakeLists.txt
M include/grgsm/misc_utils/CMakeLists.txt
M include/grgsm/qa_utils/CMakeLists.txt
M include/grgsm/receiver/CMakeLists.txt
M include/grgsm/transmitter/CMakeLists.txt
M include/grgsm/trx/CMakeLists.txt
M python/demapping/CMakeLists.txt
M python/receiver/CMakeLists.txt
M python/transmitter/CMakeLists.txt
27 files changed, 79 insertions(+), 38 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/96/24096/1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8d7ef0..2231bc3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -175,6 +175,8 @@
 # Install cmake search helper for this library
 ########################################################################
 
-install(FILES cmake/Modules/gr-gsmConfig.cmake
+install(
+    FILES
+    cmake/Modules/gr-gsmConfig.cmake
     DESTINATION ${CMAKE_MODULES_DIR}/grgsm
 )
diff --git a/apps/apps_data/CMakeLists.txt b/apps/apps_data/CMakeLists.txt
index db8a843..24ed3f0 100644
--- a/apps/apps_data/CMakeLists.txt
+++ b/apps/apps_data/CMakeLists.txt
@@ -35,7 +35,9 @@
         ${CMAKE_CURRENT_BINARY_DIR}/grgsm_setup_freedesktop
     @ONLY)
     install(
-        PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/grgsm_setup_freedesktop
-        DESTINATION ${GR_PKG_LIBEXEC_DIR} COMPONENT "gr-gsm"
+        PROGRAMS
+        ${CMAKE_CURRENT_BINARY_DIR}/grgsm_setup_freedesktop
+        DESTINATION ${GR_PKG_LIBEXEC_DIR}
+        COMPONENT "gr-gsm"
     )
 endif(UNIX AND HAVE_XDG_UTILS)
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index ed0fe3d..d2f9b1c 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -54,7 +54,11 @@
     message(WARNING "rst2man from python-docutils is required to build man pages")
 else()
     build_man_page(MAN1_OUTPUT grgsm_livemon.rst grgsm_livemon.1)
-    install(FILES ${MAN1_OUTPUT} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
+    install(
+        FILES
+        ${MAN1_OUTPUT}
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1
+    )
 endif()
 
 
diff --git a/docs/doxygen/CMakeLists.txt b/docs/doxygen/CMakeLists.txt
index 6ade92c..ce64cec 100644
--- a/docs/doxygen/CMakeLists.txt
+++ b/docs/doxygen/CMakeLists.txt
@@ -50,4 +50,8 @@
 
 add_custom_target(doxygen_target ALL DEPENDS ${BUILT_DIRS})
 
-install(DIRECTORY ${BUILT_DIRS} DESTINATION ${GR_PKG_DOC_DIR})
+install(
+    DIRECTORY
+    ${BUILT_DIRS}
+    DESTINATION ${GR_PKG_DOC_DIR}
+)
diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt
index deee6e0..173b642 100644
--- a/grc/CMakeLists.txt
+++ b/grc/CMakeLists.txt
@@ -25,6 +25,8 @@
 add_subdirectory(misc_utils)
 add_subdirectory(transmitter)
 add_subdirectory(trx)
-install(FILES
-    gsm.tree.yml DESTINATION share/gnuradio/grc/blocks
+install(
+    FILES
+    gsm.tree.yml
+    DESTINATION share/gnuradio/grc/blocks
 )
diff --git a/grc/decoding/CMakeLists.txt b/grc/decoding/CMakeLists.txt
index 63a2ee6..71953f0 100644
--- a/grc/decoding/CMakeLists.txt
+++ b/grc/decoding/CMakeLists.txt
@@ -17,7 +17,8 @@
 # the Free Software Foundation, Inc., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
 
-install(FILES
+install(
+    FILES
     gsm_control_channels_decoder.block.yml
     gsm_tch_f_decoder.block.yml
     gsm_tch_h_decoder.block.yml
diff --git a/grc/decryption/CMakeLists.txt b/grc/decryption/CMakeLists.txt
index e71e466..455ee0b 100644
--- a/grc/decryption/CMakeLists.txt
+++ b/grc/decryption/CMakeLists.txt
@@ -17,7 +17,8 @@
 # the Free Software Foundation, Inc., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
 
-install(FILES
+install(
+    FILES
     gsm_decryption.block.yml
     DESTINATION share/gnuradio/grc/blocks
 )
diff --git a/grc/demapping/CMakeLists.txt b/grc/demapping/CMakeLists.txt
index 2572235..2bc5750 100644
--- a/grc/demapping/CMakeLists.txt
+++ b/grc/demapping/CMakeLists.txt
@@ -17,7 +17,8 @@
 # the Free Software Foundation, Inc., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
 
-install(FILES
+install(
+    FILES
     gsm_universal_ctrl_chans_demapper.block.yml
     gsm_bcch_ccch_demapper.block.yml
     gsm_bcch_ccch_sdcch4_demapper.block.yml
diff --git a/grc/flow_control/CMakeLists.txt b/grc/flow_control/CMakeLists.txt
index 2876512..4e878df 100644
--- a/grc/flow_control/CMakeLists.txt
+++ b/grc/flow_control/CMakeLists.txt
@@ -17,7 +17,8 @@
 # the Free Software Foundation, Inc., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
 
-install(FILES
+install(
+    FILES
     gsm_burst_timeslot_splitter.block.yml
     gsm_burst_fnr_filter.block.yml
     gsm_burst_timeslot_filter.block.yml
diff --git a/grc/misc_utils/CMakeLists.txt b/grc/misc_utils/CMakeLists.txt
index 73869d3..3acb63e 100644
--- a/grc/misc_utils/CMakeLists.txt
+++ b/grc/misc_utils/CMakeLists.txt
@@ -17,7 +17,8 @@
 # the Free Software Foundation, Inc., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
 
-install(FILES
+install(
+    FILES
     gsm_extract_system_info.block.yml
     gsm_extract_immediate_assignment.block.yml
     gsm_collect_system_info.block.yml
diff --git a/grc/qa_utils/CMakeLists.txt b/grc/qa_utils/CMakeLists.txt
index 2ed15a1..f849a3e 100644
--- a/grc/qa_utils/CMakeLists.txt
+++ b/grc/qa_utils/CMakeLists.txt
@@ -17,7 +17,8 @@
 # the Free Software Foundation, Inc., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
 
-install(FILES
+install(
+    FILES
     gsm_burst_source.block.xml
     gsm_burst_sink.block.xml
     gsm_message_source.block.xml
diff --git a/grc/receiver/CMakeLists.txt b/grc/receiver/CMakeLists.txt
index 3db5983..06a3c0c 100644
--- a/grc/receiver/CMakeLists.txt
+++ b/grc/receiver/CMakeLists.txt
@@ -17,7 +17,8 @@
 # the Free Software Foundation, Inc., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
 
-install(FILES
+install(
+    FILES
     gsm_input.block.yml
     gsm_receiver.block.yml
     gsm_receiver_with_uplink.block.yml
diff --git a/grc/transmitter/CMakeLists.txt b/grc/transmitter/CMakeLists.txt
index d66ea32..a012435 100644
--- a/grc/transmitter/CMakeLists.txt
+++ b/grc/transmitter/CMakeLists.txt
@@ -17,7 +17,8 @@
 # the Free Software Foundation, Inc., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
 
-install(FILES
+install(
+    FILES
     gsm_gmsk_mod.block.yml
     gsm_txtime_bursts_tagger.block.yml
     gsm_txtime_setter.block.yml
diff --git a/grc/trx/CMakeLists.txt b/grc/trx/CMakeLists.txt
index e448cdd..bcbac28 100644
--- a/grc/trx/CMakeLists.txt
+++ b/grc/trx/CMakeLists.txt
@@ -17,7 +17,8 @@
 # the Free Software Foundation, Inc., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
 
-install(FILES
+install(
+    FILES
     gsm_trx_burst_if.block.yml
     DESTINATION share/gnuradio/grc/blocks
 )
diff --git a/include/grgsm/CMakeLists.txt b/include/grgsm/CMakeLists.txt
index 2982ef1..2f64ff4 100644
--- a/include/grgsm/CMakeLists.txt
+++ b/include/grgsm/CMakeLists.txt
@@ -20,7 +20,8 @@
 ########################################################################
 # Install public header files
 ########################################################################
-install(FILES
+install(
+    FILES
     plotting.hpp
     api.h
     gsmtap.h
diff --git a/include/grgsm/decoding/CMakeLists.txt b/include/grgsm/decoding/CMakeLists.txt
index 1014955..6210dad 100644
--- a/include/grgsm/decoding/CMakeLists.txt
+++ b/include/grgsm/decoding/CMakeLists.txt
@@ -20,9 +20,10 @@
 ########################################################################
 # Install public header files
 ########################################################################
-install(FILES
-    control_channels_decoder.h 
+install(
+    FILES
+    control_channels_decoder.h
     tch_f_decoder.h
     tch_h_decoder.h
-	DESTINATION include/grgsm/decoding
+    DESTINATION include/grgsm/decoding
 )
diff --git a/include/grgsm/decryption/CMakeLists.txt b/include/grgsm/decryption/CMakeLists.txt
index 3a0c6b6..f267201 100644
--- a/include/grgsm/decryption/CMakeLists.txt
+++ b/include/grgsm/decryption/CMakeLists.txt
@@ -20,6 +20,8 @@
 ########################################################################
 # Install public header files
 ########################################################################
-install(FILES
-    decryption.h DESTINATION include/grgsm/decoding
+install(
+    FILES
+    decryption.h
+    DESTINATION include/grgsm/decoding
 )
diff --git a/include/grgsm/demapping/CMakeLists.txt b/include/grgsm/demapping/CMakeLists.txt
index 0165d24..25462fb 100644
--- a/include/grgsm/demapping/CMakeLists.txt
+++ b/include/grgsm/demapping/CMakeLists.txt
@@ -20,7 +20,8 @@
 ########################################################################
 # Install public header files
 ########################################################################
-install(FILES
+install(
+    FILES
     universal_ctrl_chans_demapper.h 
     tch_f_chans_demapper.h
     tch_h_chans_demapper.h
diff --git a/include/grgsm/flow_control/CMakeLists.txt b/include/grgsm/flow_control/CMakeLists.txt
index d86f1c7..6feee61 100644
--- a/include/grgsm/flow_control/CMakeLists.txt
+++ b/include/grgsm/flow_control/CMakeLists.txt
@@ -20,7 +20,8 @@
 ########################################################################
 # Install public header files
 ########################################################################
-install(FILES
+install(
+    FILES
     common.h
     burst_timeslot_splitter.h
     burst_sdcch_subslot_splitter.h
@@ -28,6 +29,7 @@
     burst_sdcch_subslot_filter.h
     burst_fnr_filter.h
     burst_type_filter.h
-    dummy_burst_filter.h 
-    uplink_downlink_splitter.h DESTINATION include/grgsm/flow_control
+    dummy_burst_filter.h
+    uplink_downlink_splitter.h
+    DESTINATION include/grgsm/flow_control
 )
diff --git a/include/grgsm/misc_utils/CMakeLists.txt b/include/grgsm/misc_utils/CMakeLists.txt
index f8d8cbc..b151527 100644
--- a/include/grgsm/misc_utils/CMakeLists.txt
+++ b/include/grgsm/misc_utils/CMakeLists.txt
@@ -20,7 +20,8 @@
 ########################################################################
 # Install public header files
 ########################################################################
-install(FILES
+install(
+    FILES
     bursts_printer.h
     burst_file_source.h
     burst_file_sink.h
@@ -38,5 +39,6 @@
     burst_to_fn_time.h
     controlled_fractional_resampler_cc.h 
     time_spec.h
-    fn_time.h DESTINATION include/grgsm/misc_utils
+    fn_time.h
+    DESTINATION include/grgsm/misc_utils
 )
diff --git a/include/grgsm/qa_utils/CMakeLists.txt b/include/grgsm/qa_utils/CMakeLists.txt
index 44bbbfb..a74a358 100644
--- a/include/grgsm/qa_utils/CMakeLists.txt
+++ b/include/grgsm/qa_utils/CMakeLists.txt
@@ -20,9 +20,11 @@
 ########################################################################
 # Install public header files
 ########################################################################
-install(FILES
+install(
+    FILES
     burst_sink.h
     burst_source.h
     message_source.h
-    message_sink.h DESTINATION include/grgsm/qa_utils
+    message_sink.h
+    DESTINATION include/grgsm/qa_utils
 )
diff --git a/include/grgsm/receiver/CMakeLists.txt b/include/grgsm/receiver/CMakeLists.txt
index bb4515d..8bf6370 100644
--- a/include/grgsm/receiver/CMakeLists.txt
+++ b/include/grgsm/receiver/CMakeLists.txt
@@ -20,8 +20,10 @@
 ########################################################################
 # Install public header files
 ########################################################################
-install(FILES
+install(
+    FILES
     clock_offset_control.h
     cx_channel_hopper.h
-    receiver.h DESTINATION include/grgsm/receiver
+    receiver.h
+    DESTINATION include/grgsm/receiver
 )
diff --git a/include/grgsm/transmitter/CMakeLists.txt b/include/grgsm/transmitter/CMakeLists.txt
index fab6f7c..cdd140d 100644
--- a/include/grgsm/transmitter/CMakeLists.txt
+++ b/include/grgsm/transmitter/CMakeLists.txt
@@ -20,8 +20,9 @@
 ########################################################################
 # Install public header files
 ########################################################################
-install(FILES
-    txtime_setter.h 
+install(
+    FILES
+    txtime_setter.h
     preprocess_tx_burst.h
     gen_test_ab.h
     DESTINATION include/grgsm/transmitter
diff --git a/include/grgsm/trx/CMakeLists.txt b/include/grgsm/trx/CMakeLists.txt
index a9847dd..0869701 100644
--- a/include/grgsm/trx/CMakeLists.txt
+++ b/include/grgsm/trx/CMakeLists.txt
@@ -20,7 +20,8 @@
 ########################################################################
 # Install public header files
 ########################################################################
-install(FILES
+install(
+    FILES
     trx_burst_if.h
     DESTINATION include/grgsm/trx
 )
diff --git a/python/demapping/CMakeLists.txt b/python/demapping/CMakeLists.txt
index 9f0efb4..0de1d98 100644
--- a/python/demapping/CMakeLists.txt
+++ b/python/demapping/CMakeLists.txt
@@ -21,5 +21,6 @@
     FILES
     gsm_bcch_ccch_demapper.py
     gsm_bcch_ccch_sdcch4_demapper.py
-    gsm_sdcch8_demapper.py DESTINATION ${GR_PYTHON_DIR}/grgsm
+    gsm_sdcch8_demapper.py
+    DESTINATION ${GR_PYTHON_DIR}/grgsm
 )
diff --git a/python/receiver/CMakeLists.txt b/python/receiver/CMakeLists.txt
index 8ab902b..a7a9e3e 100644
--- a/python/receiver/CMakeLists.txt
+++ b/python/receiver/CMakeLists.txt
@@ -23,5 +23,6 @@
     fcch_burst_tagger.py
     sch_detector.py
     fcch_detector.py
-    chirpz.py DESTINATION ${GR_PYTHON_DIR}/grgsm
+    chirpz.py
+    DESTINATION ${GR_PYTHON_DIR}/grgsm
 )
diff --git a/python/transmitter/CMakeLists.txt b/python/transmitter/CMakeLists.txt
index c32d6e1..3a5bbe8 100644
--- a/python/transmitter/CMakeLists.txt
+++ b/python/transmitter/CMakeLists.txt
@@ -20,5 +20,6 @@
 GR_PYTHON_INSTALL(
     FILES
     txtime_bursts_tagger.py
-    gsm_gmsk_mod.py DESTINATION ${GR_PYTHON_DIR}/grgsm
+    gsm_gmsk_mod.py
+    DESTINATION ${GR_PYTHON_DIR}/grgsm
 )

-- 
To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24096
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-Change-Id: Ib7d571af629b0af78397a411b0cca409a6d218d8
Gerrit-Change-Number: 24096
Gerrit-PatchSet: 1
Gerrit-Owner: ptrkrysik <ptrkrysik at gmail.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210503/6f356b66/attachment.htm>


More information about the gerrit-log mailing list