Merge branch 'next' into kf19-next

src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt

@@ -78,6 +78,9 @@ add_library(tracking_gr_blocks
 
 if(${FILESYSTEM_FOUND})
     target_compile_definitions(tracking_gr_blocks PRIVATE -DHAS_STD_FILESYSTEM=1)
+    if(${find_experimental})
+        target_compile_definitions(tracking_gr_blocks PRIVATE -DHAS_STD_FILESYSTEM_EXPERIMENTAL=1)
+    endif()
     target_link_libraries(tracking_gr_blocks PRIVATE std::filesystem)
 else()
     target_link_libraries(tracking_gr_blocks PRIVATE Boost::filesystem)

src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc

@@ -67,8 +67,13 @@
 #include <map>
 
 #if HAS_STD_FILESYSTEM
+#if HAS_STD_FILESYSTEM_EXPERIMENTAL
+#include <experimental/filesystem>
+namespace fs = std::experimental::filesystem;
+#else
 #include <filesystem>
 namespace fs = std::filesystem;
+#endif
 #else
 #include <boost/filesystem/path.hpp>
 namespace fs = boost::filesystem;

src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc

@@ -60,8 +60,13 @@
 #include <map>
 
 #if HAS_STD_FILESYSTEM
+#if HAS_STD_FILESYSTEM_EXPERIMENTAL
+#include <experimental/filesystem>
+namespace fs = std::experimental::filesystem;
+#else
 #include <filesystem>
 namespace fs = std::filesystem;
+#endif
 #else
 #include <boost/filesystem/path.hpp>
 namespace fs = boost::filesystem;

src/algorithms/tracking/libs/nonlinear_tracking.h

@@ -8,7 +8,7 @@
  * an Unscented Kalman Filter which uses Unscented Transform rules to
  * perform a similar estimation.
  *
- * [1] I Arasaratnam and S Haykin. Cubature kalman filters. IEEE 
+ * [1] I Arasaratnam and S Haykin. Cubature kalman filters. IEEE
  * Transactions on Automatic Control, 54(6):1254–1269,2009.
  *
  * \authors <ul>