[hamradio-commits] [gnss-sdr] 10/20: Improve package reproducibility

Carles Fernandez carles_fernandez-guest at moszumanska.debian.org
Thu Jun 30 20:08:59 UTC 2016


This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch master
in repository gnss-sdr.

commit 5a73b4e047db0eb6263e6cc18ca2afb4e5bc0057
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Mon May 23 19:51:59 2016 +0200

    Improve package reproducibility
    
    Packages using CMake often use file(GLOB ...) to retrieve a list of
    source files. As this is based on readdir(), the resulting file list
    is unsorted. A common use case is to pass this list directly to
    add_executable or add_library. But as the order is unpredictable, the
    binaries are not reproducible (because the order in which the objects
    are linked will vary).
    
    See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=824263
---
 src/algorithms/PVT/adapters/CMakeLists.txt                          | 1 +
 src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt                   | 1 +
 src/algorithms/PVT/libs/CMakeLists.txt                              | 1 +
 src/algorithms/acquisition/adapters/CMakeLists.txt                  | 1 +
 src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt           | 1 +
 src/algorithms/channel/adapters/CMakeLists.txt                      | 1 +
 src/algorithms/channel/libs/CMakeLists.txt                          | 1 +
 src/algorithms/conditioner/adapters/CMakeLists.txt                  | 1 +
 src/algorithms/data_type_adapter/adapters/CMakeLists.txt            | 1 +
 src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt     | 1 +
 src/algorithms/input_filter/adapters/CMakeLists.txt                 | 1 +
 src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt          | 1 +
 src/algorithms/libs/CMakeLists.txt                                  | 1 +
 .../libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt        | 6 ++++++
 src/algorithms/observables/adapters/CMakeLists.txt                  | 1 +
 src/algorithms/observables/gnuradio_blocks/CMakeLists.txt           | 1 +
 src/algorithms/resampler/adapters/CMakeLists.txt                    | 1 +
 src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt             | 1 +
 src/algorithms/signal_generator/adapters/CMakeLists.txt             | 1 +
 src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt      | 1 +
 src/algorithms/signal_source/adapters/CMakeLists.txt                | 1 +
 src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt         | 1 +
 src/algorithms/signal_source/libs/CMakeLists.txt                    | 1 +
 src/algorithms/telemetry_decoder/adapters/CMakeLists.txt            | 1 +
 src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt     | 1 +
 src/algorithms/telemetry_decoder/libs/CMakeLists.txt                | 1 +
 src/algorithms/tracking/adapters/CMakeLists.txt                     | 1 +
 src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt              | 1 +
 src/algorithms/tracking/libs/CMakeLists.txt                         | 1 +
 src/core/libs/CMakeLists.txt                                        | 1 +
 src/core/libs/supl/CMakeLists.txt                                   | 6 ++++--
 src/core/receiver/CMakeLists.txt                                    | 2 ++
 src/core/system_parameters/CMakeLists.txt                           | 1 +
 src/utils/front-end-cal/CMakeLists.txt                              | 1 +
 34 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/algorithms/PVT/adapters/CMakeLists.txt b/src/algorithms/PVT/adapters/CMakeLists.txt
index 51ebcdc..3a7e524 100644
--- a/src/algorithms/PVT/adapters/CMakeLists.txt
+++ b/src/algorithms/PVT/adapters/CMakeLists.txt
@@ -37,6 +37,7 @@ include_directories(
 )
 
 file(GLOB PVT_ADAPTER_HEADERS "*.h")
+list(SORT PVT_ADAPTER_HEADERS)
 add_library(pvt_adapters ${PVT_ADAPTER_SOURCES} ${PVT_ADAPTER_HEADERS})
 source_group(Headers FILES ${PVT_ADAPTER_HEADERS})
 target_link_libraries(pvt_adapters pvt_gr_blocks ${ARMADILLO_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES})
diff --git a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
index 7bf8fcc..1eb1eaf 100644
--- a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
@@ -36,6 +36,7 @@ include_directories(
 )
 
 file(GLOB PVT_GR_BLOCKS_HEADERS "*.h")
+list(SORT PVT_GR_BLOCKS_HEADERS)
 add_library(pvt_gr_blocks ${PVT_GR_BLOCKS_SOURCES} ${PVT_GR_BLOCKS_HEADERS})
 source_group(Headers FILES ${PVT_GR_BLOCKS_HEADERS})
 target_link_libraries(pvt_gr_blocks pvt_lib ${ARMADILLO_LIBRARIES})
diff --git a/src/algorithms/PVT/libs/CMakeLists.txt b/src/algorithms/PVT/libs/CMakeLists.txt
index e64975e..b3b323d 100644
--- a/src/algorithms/PVT/libs/CMakeLists.txt
+++ b/src/algorithms/PVT/libs/CMakeLists.txt
@@ -43,6 +43,7 @@ include_directories(
      ${GLOG_INCLUDE_DIRS}
 )
 file(GLOB PVT_LIB_HEADERS "*.h")
+list(SORT PVT_LIB_HEADERS)
 add_library(pvt_lib ${PVT_LIB_SOURCES} ${PVT_LIB_HEADERS})
 source_group(Headers FILES ${PVT_LIB_HEADERS})
 add_dependencies(pvt_lib armadillo-${armadillo_RELEASE} glog-${glog_RELEASE})
diff --git a/src/algorithms/acquisition/adapters/CMakeLists.txt b/src/algorithms/acquisition/adapters/CMakeLists.txt
index 5d27297..1ead04d 100644
--- a/src/algorithms/acquisition/adapters/CMakeLists.txt
+++ b/src/algorithms/acquisition/adapters/CMakeLists.txt
@@ -54,6 +54,7 @@ include_directories(
 )
 
 file(GLOB ACQ_ADAPTER_HEADERS "*.h")
+list(SORT ACQ_ADAPTER_HEADERS)
 add_library(acq_adapters ${ACQ_ADAPTER_SOURCES} ${ACQ_ADAPTER_HEADERS})
 source_group(Headers FILES ${ACQ_ADAPTER_HEADERS}) 
 target_link_libraries(acq_adapters gnss_sp_libs acq_gr_blocks ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES})
diff --git a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
index 70d887f..945d5e2 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
@@ -57,6 +57,7 @@ if(OPENCL_FOUND)
 endif(OPENCL_FOUND)
 
 file(GLOB ACQ_GR_BLOCKS_HEADERS "*.h")
+list(SORT ACQ_GR_BLOCKS_HEADERS)
 add_library(acq_gr_blocks ${ACQ_GR_BLOCKS_SOURCES} ${ACQ_GR_BLOCKS_HEADERS})
 source_group(Headers FILES ${ACQ_GR_BLOCKS_HEADERS}) 
 target_link_libraries(acq_gr_blocks gnss_sp_libs gnss_system_parameters ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_FFT_LIBRARIES} ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${OPT_LIBRARIES})
diff --git a/src/algorithms/channel/adapters/CMakeLists.txt b/src/algorithms/channel/adapters/CMakeLists.txt
index 802a999..b3efdcf 100644
--- a/src/algorithms/channel/adapters/CMakeLists.txt
+++ b/src/algorithms/channel/adapters/CMakeLists.txt
@@ -31,6 +31,7 @@ include_directories(
 )
 
 file(GLOB CHANNEL_ADAPTER_HEADERS "*.h")
+list(SORT CHANNEL_ADAPTER_HEADERS)
 add_library(channel_adapters ${CHANNEL_ADAPTER_SOURCES} ${CHANNEL_ADAPTER_HEADERS})
 source_group(Headers FILES ${CHANNEL_ADAPTER_HEADERS})
 target_link_libraries(channel_adapters channel_fsm ${GNURADIO_RUNTIME_LIBRARIES} ${Boost_LIBRARIES})
diff --git a/src/algorithms/channel/libs/CMakeLists.txt b/src/algorithms/channel/libs/CMakeLists.txt
index cbb2966..40dfdbe 100644
--- a/src/algorithms/channel/libs/CMakeLists.txt
+++ b/src/algorithms/channel/libs/CMakeLists.txt
@@ -34,6 +34,7 @@ include_directories(
 )
 
 file(GLOB CHANNEL_FSM_HEADERS "*.h")
+list(SORT CHANNEL_FSM_HEADERS)
 add_library(channel_fsm ${CHANNEL_FSM_SOURCES} ${CHANNEL_FSM_HEADERS})
 source_group(Headers FILES ${CHANNEL_FSM_HEADERS})
 add_dependencies(channel_fsm glog-${glog_RELEASE})
diff --git a/src/algorithms/conditioner/adapters/CMakeLists.txt b/src/algorithms/conditioner/adapters/CMakeLists.txt
index d6b25b5..371a78d 100644
--- a/src/algorithms/conditioner/adapters/CMakeLists.txt
+++ b/src/algorithms/conditioner/adapters/CMakeLists.txt
@@ -35,6 +35,7 @@ include_directories(
 )
 
 file(GLOB COND_ADAPTER_HEADERS "*.h")
+list(SORT COND_ADAPTER_HEADERS)
 add_library(conditioner_adapters ${COND_ADAPTER_SOURCES} ${COND_ADAPTER_HEADERS})
 source_group(Headers FILES ${COND_ADAPTER_HEADERS})
 add_dependencies(conditioner_adapters glog-${glog_RELEASE})
\ No newline at end of file
diff --git a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt
index ee0c65e..659ebf7 100644
--- a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt
+++ b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt
@@ -38,6 +38,7 @@ include_directories(
 )
 
 file(GLOB DATATYPE_ADAPTER_HEADERS "*.h")
+list(SORT DATATYPE_ADAPTER_HEADERS)
 add_library(datatype_adapters ${DATATYPE_ADAPTER_SOURCES} ${DATATYPE_ADAPTER_HEADERS})
 source_group(Headers FILES ${DATATYPE_ADAPTER_HEADERS})
 add_dependencies(datatype_adapters glog-${glog_RELEASE})
diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt b/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt
index 64eb317..111c87c 100644
--- a/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt
@@ -30,6 +30,7 @@ include_directories(
 )
 
 file(GLOB DATA_TYPE_GR_BLOCKS_HEADERS "*.h")
+list(SORT DATA_TYPE_GR_BLOCKS_HEADERS)
 add_library(data_type_gr_blocks ${DATA_TYPE_GR_BLOCKS_SOURCES} ${DATA_TYPE_GR_BLOCKS_HEADERS})
 source_group(Headers FILES ${DATA_TYPE_GR_BLOCKS_HEADERS})
 target_link_libraries(data_type_gr_blocks ${GNURADIO_RUNTIME_LIBRARIES} ${VOLK_LIBRARIES})
\ No newline at end of file
diff --git a/src/algorithms/input_filter/adapters/CMakeLists.txt b/src/algorithms/input_filter/adapters/CMakeLists.txt
index 019415c..a4cb2b8 100644
--- a/src/algorithms/input_filter/adapters/CMakeLists.txt
+++ b/src/algorithms/input_filter/adapters/CMakeLists.txt
@@ -35,6 +35,7 @@ include_directories(
 )
 
 file(GLOB INPUT_FILTER_ADAPTER_HEADERS "*.h")
+list(SORT INPUT_FILTER_ADAPTER_HEADERS)
 add_library(input_filter_adapters ${INPUT_FILTER_ADAPTER_SOURCES} ${INPUT_FILTER_ADAPTER_HEADERS})
 source_group(Headers FILES ${INPUT_FILTER_ADAPTER_HEADERS})
 add_dependencies(input_filter_adapters glog-${glog_RELEASE} gnss_sp_libs)
diff --git a/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt b/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt
index 050425b..ff87ecb 100644
--- a/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt
@@ -30,6 +30,7 @@ include_directories(
 )
 
 file(GLOB INPUT_FILTER_GR_BLOCKS_HEADERS "*.h")
+list(SORT INPUT_FILTER_GR_BLOCKS_HEADERS)
 add_library(input_filter_gr_blocks ${INPUT_FILTER_GR_BLOCKS_SOURCES} ${INPUT_FILTER_GR_BLOCKS_HEADERS})
 source_group(Headers FILES ${INPUT_FILTER_GR_BLOCKS_HEADERS})
 target_link_libraries(input_filter_gr_blocks ${GNURADIO_RUNTIME_LIBRARIES})
diff --git a/src/algorithms/libs/CMakeLists.txt b/src/algorithms/libs/CMakeLists.txt
index f2602eb..f0a6291 100644
--- a/src/algorithms/libs/CMakeLists.txt
+++ b/src/algorithms/libs/CMakeLists.txt
@@ -65,6 +65,7 @@ if(OPENCL_FOUND)
 endif(OPENCL_FOUND)
 
 file(GLOB GNSS_SPLIBS_HEADERS "*.h")
+list(SORT GNSS_SPLIBS_HEADERS)
 add_library(gnss_sp_libs ${GNSS_SPLIBS_SOURCES} ${GNSS_SPLIBS_HEADERS})
 source_group(Headers FILES ${GNSS_SPLIBS_HEADERS})
 
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt
index 1b8f742..90b0a53 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt
@@ -328,8 +328,11 @@ message(STATUS "Available machines: ${available_machines}")
 
 #dependencies are all python, xml, and header implementation files
 file(GLOB xml_files ${PROJECT_SOURCE_DIR}/gen/*.xml)
+list(SORT xml_files)
 file(GLOB py_files ${PROJECT_SOURCE_DIR}/gen/*.py)
+list(SORT py_files)
 file(GLOB h_files ${PROJECT_SOURCE_DIR}/kernels/volk_gnsssdr/*.h)
+list(SORT h_files)
 
 macro(gen_template tmpl output)
     list(APPEND volk_gnsssdr_gen_sources ${output})
@@ -437,6 +440,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.9")
       # then add the files
       include_directories(${PROJECT_SOURCE_DIR}/kernels/volk_gnsssdr/asm/neon)
       file(GLOB asm_files ${PROJECT_SOURCE_DIR}/kernels/volk_gnsssdr/asm/neon/*.s)
+      list(SORT asm_files)
       foreach(asm_file ${asm_files})
         list(APPEND volk_gnsssdr_sources ${asm_file})
         message(STATUS "Adding source file: ${asm_file}")
@@ -469,6 +473,7 @@ if(ORC_FOUND)
 
     #setup orc functions
     file(GLOB orc_files ${PROJECT_SOURCE_DIR}/kernels/volk_gnsssdr/asm/orc/*.orc)
+    list(SORT orc_files)
     foreach(orc_file ${orc_files})
 
         #extract the name for the generated c source from the orc file
@@ -539,6 +544,7 @@ if(CMAKE_VERSION VERSION_GREATER "2.8.7")
 
     #Add dynamic library
     file(GLOB orc ${PROJECT_SOURCE_DIR}/kernels/volk_gnsssdr/asm/orc/*.orc)
+    list(SORT orc)
     
     if(ENABLE_STATIC_LIBS)
         add_library(volk_gnsssdr STATIC $<TARGET_OBJECTS:volk_gnsssdr_obj> ${orc})
diff --git a/src/algorithms/observables/adapters/CMakeLists.txt b/src/algorithms/observables/adapters/CMakeLists.txt
index 0969dc2..eac4e6e 100644
--- a/src/algorithms/observables/adapters/CMakeLists.txt
+++ b/src/algorithms/observables/adapters/CMakeLists.txt
@@ -35,6 +35,7 @@ include_directories(
 )
 
 file(GLOB OBS_ADAPTER_HEADERS "*.h")
+list(SORT OBS_ADAPTER_HEADERS)
 add_library(obs_adapters ${OBS_ADAPTER_SOURCES} ${OBS_ADAPTER_HEADERS})
 source_group(Headers FILES ${OBS_ADAPTER_HEADERS})
 target_link_libraries(obs_adapters obs_gr_blocks ${GNURADIO_RUNTIME_LIBRARIES})
diff --git a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
index f879f93..aad359d 100644
--- a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
@@ -36,6 +36,7 @@ include_directories(
 )
 
 file(GLOB OBS_GR_BLOCKS_HEADERS "*.h")
+list(SORT OBS_GR_BLOCKS_HEADERS)
 add_library(obs_gr_blocks ${OBS_GR_BLOCKS_SOURCES} ${OBS_GR_BLOCKS_HEADERS})
 source_group(Headers FILES ${OBS_GR_BLOCKS_HEADERS})
 add_dependencies(obs_gr_blocks glog-${glog_RELEASE} armadillo-${armadillo_RELEASE})
diff --git a/src/algorithms/resampler/adapters/CMakeLists.txt b/src/algorithms/resampler/adapters/CMakeLists.txt
index 709d516..de168ee 100644
--- a/src/algorithms/resampler/adapters/CMakeLists.txt
+++ b/src/algorithms/resampler/adapters/CMakeLists.txt
@@ -29,6 +29,7 @@ include_directories(
 )
 
 file(GLOB RESAMPLER_ADAPTER_HEADERS "*.h")
+list(SORT RESAMPLER_ADAPTER_HEADERS)
 add_library(resampler_adapters ${RESAMPLER_ADAPTER_SOURCES} ${RESAMPLER_ADAPTER_HEADERS})
 source_group(Headers FILES ${RESAMPLER_ADAPTER_HEADERS})
 target_link_libraries(resampler_adapters resampler_gr_blocks)
diff --git a/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt b/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt
index 12d803c..13d8427 100644
--- a/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt
@@ -32,6 +32,7 @@ include_directories(
 )
 
 file(GLOB RESAMPLER_GR_BLOCKS_HEADERS "*.h")
+list(SORT RESAMPLER_GR_BLOCKS_HEADERS)
 add_library(resampler_gr_blocks ${RESAMPLER_GR_BLOCKS_SOURCES} ${RESAMPLER_GR_BLOCKS_HEADERS})
 source_group(Headers FILES ${RESAMPLER_GR_BLOCKS_HEADERS})
 add_dependencies(resampler_gr_blocks glog-${glog_RELEASE})
\ No newline at end of file
diff --git a/src/algorithms/signal_generator/adapters/CMakeLists.txt b/src/algorithms/signal_generator/adapters/CMakeLists.txt
index 83c4f2d..c55031d 100644
--- a/src/algorithms/signal_generator/adapters/CMakeLists.txt
+++ b/src/algorithms/signal_generator/adapters/CMakeLists.txt
@@ -31,6 +31,7 @@ include_directories(
 )
 
 file(GLOB SIGNAL_GENERATOR_ADAPTER_HEADERS "*.h")
+list(SORT SIGNAL_GENERATOR_ADAPTER_HEADERS)
 add_library(signal_generator_adapters ${SIGNAL_GENERATOR_ADAPTER_SOURCES} ${SIGNAL_GENERATOR_ADAPTER_HEADERS})
 source_group(Headers FILES ${SIGNAL_GENERATOR_ADAPTER_HEADERS})
 target_link_libraries(signal_generator_adapters gnss_sp_libs 
diff --git a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
index 9fdfca2..08629e4 100644
--- a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
@@ -31,6 +31,7 @@ include_directories(
 )
 
 file(GLOB SIGNAL_GENERATOR_BLOCK_HEADERS "*.h")
+list(SORT SIGNAL_GENERATOR_BLOCK_HEADERS)
 add_library(signal_generator_blocks ${SIGNAL_GENERATOR_BLOCK_SOURCES} ${SIGNAL_GENERATOR_BLOCK_HEADERS})
 source_group(Headers FILES ${SIGNAL_GENERATOR_BLOCK_HEADERS})
 target_link_libraries(signal_generator_blocks gnss_system_parameters gnss_sp_libs
diff --git a/src/algorithms/signal_source/adapters/CMakeLists.txt b/src/algorithms/signal_source/adapters/CMakeLists.txt
index 2398eb9..952fb64 100644
--- a/src/algorithms/signal_source/adapters/CMakeLists.txt
+++ b/src/algorithms/signal_source/adapters/CMakeLists.txt
@@ -167,6 +167,7 @@ endif(ARCH_64BITS)
 add_definitions(-DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}")
 
 file(GLOB SIGNAL_SOURCE_ADAPTER_HEADERS "*.h")
+list(SORT SIGNAL_SOURCE_ADAPTER_HEADERS)
 add_library(signal_source_adapters ${SIGNAL_SOURCE_ADAPTER_SOURCES} ${SIGNAL_SOURCE_ADAPTER_HEADERS})
 source_group(Headers FILES ${SIGNAL_SOURCE_ADAPTER_HEADERS})
 target_link_libraries(signal_source_adapters signal_source_gr_blocks
diff --git a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
index dd97673..417f08d 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
@@ -35,6 +35,7 @@ include_directories(
 )
 
 file(GLOB SIGNAL_SOURCE_GR_BLOCKS_HEADERS "*.h")
+list(SORT SIGNAL_SOURCE_GR_BLOCKS_HEADERS)
 add_library(signal_source_gr_blocks ${SIGNAL_SOURCE_GR_BLOCKS_SOURCES} ${SIGNAL_SOURCE_GR_BLOCKS_HEADERS})
 source_group(Headers FILES ${SIGNAL_SOURCE_GR_BLOCKS_HEADERS})
 target_link_libraries(signal_source_gr_blocks signal_source_lib ${GNURADIO_RUNTIME_LIBRARIES} ${Boost_LIBRARIES})
diff --git a/src/algorithms/signal_source/libs/CMakeLists.txt b/src/algorithms/signal_source/libs/CMakeLists.txt
index 6e0d3fe..7d6c9b4 100644
--- a/src/algorithms/signal_source/libs/CMakeLists.txt
+++ b/src/algorithms/signal_source/libs/CMakeLists.txt
@@ -26,5 +26,6 @@ include_directories(
 )
 
 file(GLOB SIGNAL_SOURCE_LIB_HEADERS "*.h")
+list(SORT SIGNAL_SOURCE_LIB_HEADERS)
 add_library(signal_source_lib ${SIGNAL_SOURCE_LIB_SOURCES} ${SIGNAL_SOURCE_LIB_HEADERS})
 source_group(Headers FILES ${SIGNAL_SOURCE_LIB_HEADERS})
\ No newline at end of file
diff --git a/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt b/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt
index 9fda901..ade3581 100644
--- a/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt
+++ b/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt
@@ -38,6 +38,7 @@ include_directories(
 )
 
 file(GLOB TELEMETRY_DECODER_ADAPTER_HEADERS "*.h")
+list(SORT TELEMETRY_DECODER_ADAPTER_HEADERS)
 add_library(telemetry_decoder_adapters ${TELEMETRY_DECODER_ADAPTER_SOURCES} ${TELEMETRY_DECODER_ADAPTER_HEADERS})
 source_group(Headers FILES ${TELEMETRY_DECODER_ADAPTER_HEADERS})
 target_link_libraries(telemetry_decoder_adapters telemetry_decoder_gr_blocks gnss_system_parameters ${GNURADIO_RUNTIME_LIBRARIES})
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt b/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
index c4e9047..0796919 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
@@ -36,6 +36,7 @@ include_directories(
 )
 
 file(GLOB TELEMETRY_DECODER_GR_BLOCKS_HEADERS "*.h")
+list(SORT TELEMETRY_DECODER_GR_BLOCKS_HEADERS)
 add_library(telemetry_decoder_gr_blocks ${TELEMETRY_DECODER_GR_BLOCKS_SOURCES} ${TELEMETRY_DECODER_GR_BLOCKS_HEADERS})
 source_group(Headers FILES ${TELEMETRY_DECODER_GR_BLOCKS_HEADERS})
 target_link_libraries(telemetry_decoder_gr_blocks telemetry_decoder_lib gnss_system_parameters ${GNURADIO_RUNTIME_LIBRARIES})
diff --git a/src/algorithms/telemetry_decoder/libs/CMakeLists.txt b/src/algorithms/telemetry_decoder/libs/CMakeLists.txt
index f174a97..9b5ab2c 100644
--- a/src/algorithms/telemetry_decoder/libs/CMakeLists.txt
+++ b/src/algorithms/telemetry_decoder/libs/CMakeLists.txt
@@ -33,6 +33,7 @@ include_directories(
 )
 
 file(GLOB TELEMETRY_DECODER_LIB_HEADERS "*.h")
+list(SORT TELEMETRY_DECODER_LIB_HEADERS)
 add_library(telemetry_decoder_lib ${TELEMETRY_DECODER_LIB_SOURCES} ${TELEMETRY_DECODER_LIB_HEADERS})
 source_group(Headers FILES ${TELEMETRY_DECODER_LIB_HEADERS})
 target_link_libraries(telemetry_decoder_lib gnss_system_parameters)
\ No newline at end of file
diff --git a/src/algorithms/tracking/adapters/CMakeLists.txt b/src/algorithms/tracking/adapters/CMakeLists.txt
index c984161..275d515 100644
--- a/src/algorithms/tracking/adapters/CMakeLists.txt
+++ b/src/algorithms/tracking/adapters/CMakeLists.txt
@@ -48,6 +48,7 @@ include_directories(
 )
 
 file(GLOB TRACKING_ADAPTER_HEADERS "*.h")
+list(SORT TRACKING_ADAPTER_HEADERS)
 add_library(tracking_adapters ${TRACKING_ADAPTER_SOURCES} ${TRACKING_ADAPTER_HEADERS})
 source_group(Headers FILES ${TRACKING_ADAPTER_HEADERS})
 target_link_libraries(tracking_adapters tracking_gr_blocks gnss_sp_libs)
diff --git a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
index 1e2fe27..162c948 100644
--- a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
@@ -54,6 +54,7 @@ if(ENABLE_GENERIC_ARCH)
 endif(ENABLE_GENERIC_ARCH)
 
 file(GLOB TRACKING_GR_BLOCKS_HEADERS "*.h")
+list(SORT TRACKING_GR_BLOCKS_HEADERS)
 add_library(tracking_gr_blocks ${TRACKING_GR_BLOCKS_SOURCES} ${TRACKING_GR_BLOCKS_HEADERS})
 source_group(Headers FILES ${TRACKING_GR_BLOCKS_HEADERS})
 
diff --git a/src/algorithms/tracking/libs/CMakeLists.txt b/src/algorithms/tracking/libs/CMakeLists.txt
index bc0dc85..3aa2ec9 100644
--- a/src/algorithms/tracking/libs/CMakeLists.txt
+++ b/src/algorithms/tracking/libs/CMakeLists.txt
@@ -65,6 +65,7 @@ endif(SSE3_AVAILABLE)
 
 
 file(GLOB TRACKING_LIB_HEADERS "*.h")
+list(SORT TRACKING_LIB_HEADERS)
 add_library(tracking_lib ${TRACKING_LIB_SOURCES} ${TRACKING_LIB_HEADERS})
 source_group(Headers FILES ${TRACKING_LIB_HEADERS})
 target_link_libraries(tracking_lib ${OPT_TRACKING_LIBRARIES} ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES})
diff --git a/src/core/libs/CMakeLists.txt b/src/core/libs/CMakeLists.txt
index b7bbeb9..11c71ce 100644
--- a/src/core/libs/CMakeLists.txt
+++ b/src/core/libs/CMakeLists.txt
@@ -41,6 +41,7 @@ include_directories(
 )
 
 file(GLOB CORE_LIBS_HEADERS "*.h")
+list(SORT CORE_LIBS_HEADERS)
 add_library(rx_core_lib ${CORE_LIBS_SOURCES} ${CORE_LIBS_HEADERS})
 source_group(Headers FILES ${CORE_LIBS_HEADERS})
 target_link_libraries(rx_core_lib supl_library) 
diff --git a/src/core/libs/supl/CMakeLists.txt b/src/core/libs/supl/CMakeLists.txt
index f5c2b6e..0f0609b 100644
--- a/src/core/libs/supl/CMakeLists.txt
+++ b/src/core/libs/supl/CMakeLists.txt
@@ -16,8 +16,10 @@
 # along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
 #
 
-file(GLOB  ASN_RRLP_SOURCES "${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp/*.c")
-file(GLOB  ASN_SUPL_SOURCES "${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl/*.c")
+file(GLOB ASN_RRLP_SOURCES "${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp/*.c")
+list(SORT ASN_RRLP_SOURCES)
+file(GLOB ASN_SUPL_SOURCES "${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl/*.c")
+list(SORT ASN_SUPL_SOURCES)
 
 set (SUPL_SOURCES
 	supl.c
diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt
index db7cc37..a443b8a 100644
--- a/src/core/receiver/CMakeLists.txt
+++ b/src/core/receiver/CMakeLists.txt
@@ -118,7 +118,9 @@ endif(OPENCL_FOUND)
 add_definitions(-DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}")
 
 file(GLOB GNSS_RECEIVER_HEADERS "*.h")
+list(SORT GNSS_RECEIVER_HEADERS)
 file(GLOB GNSS_RECEIVER_INTERFACE_HEADERS "../interfaces/*.h")
+list(SORT GNSS_RECEIVER_INTERFACE_HEADERS)
 add_library(gnss_rx ${GNSS_RECEIVER_SOURCES} ${GNSS_RECEIVER_HEADERS} ${GNSS_RECEIVER_INTERFACE_HEADERS})
 source_group(Headers FILES ${GNSS_RECEIVER_HEADERS} ${GNSS_RECEIVER_INTERFACE_HEADERS})
 
diff --git a/src/core/system_parameters/CMakeLists.txt b/src/core/system_parameters/CMakeLists.txt
index e46e1ad..a22c7d9 100644
--- a/src/core/system_parameters/CMakeLists.txt
+++ b/src/core/system_parameters/CMakeLists.txt
@@ -55,6 +55,7 @@ include_directories(
 
 link_directories(${Boost_LIBRARY_DIR})
 file(GLOB SYSTEM_PARAMETERS_HEADERS "*.h")
+list(SORT SYSTEM_PARAMETERS_HEADERS)
 add_library(gnss_system_parameters ${SYSTEM_PARAMETERS_SOURCES} ${SYSTEM_PARAMETERS_HEADERS})
 source_group(Headers FILES ${SYSTEM_PARAMETERS_HEADERS})
 add_dependencies(gnss_system_parameters glog-${glog_RELEASE})
diff --git a/src/utils/front-end-cal/CMakeLists.txt b/src/utils/front-end-cal/CMakeLists.txt
index 349b161..ce1457b 100644
--- a/src/utils/front-end-cal/CMakeLists.txt
+++ b/src/utils/front-end-cal/CMakeLists.txt
@@ -44,6 +44,7 @@ include_directories(
 )
 
 file(GLOB FRONT_END_CAL_HEADERS "*.h")
+list(SORT FRONT_END_CAL_HEADERS)
 add_library(front_end_cal_lib ${FRONT_END_CAL_SOURCES} ${FRONT_END_CAL_HEADERS})
 source_group(Headers FILES ${FRONT_END_CAL_HEADERS})
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git



More information about the pkg-hamradio-commits mailing list