[3party] Treat gflags as a system header

* For compiler diagnostics * For dependency management Signed-off-by: Ferenc Géczi <[email protected]>
FinixFighter · Mar 11, 2023 · 4ad4a1e · 4ad4a1e
1 parent e88c75a
commit 4ad4a1e
Show file tree

Hide file tree

Showing 25 changed files with 33 additions and 32 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -315,6 +315,15 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
   add_subdirectory(3party/jansson/jansson/)
   target_include_directories(jansson INTERFACE "${PROJECT_BINARY_DIR}/3party/jansson/jansson/include")
 
+  # Add gflags library.
+  add_subdirectory(3party/gflags)
+  target_compile_options(gflags_nothreads_static PRIVATE $<$<CXX_COMPILER_ID:GNU>:-Wno-subobject-linkage>)
+  # Not needed for the usual build process, but it fixes QtCreator editor,
+  # that doesn't see gflags/gflags.h in binary dir (gflags has tricky cmake configuration).
+  if (PLATFORM_DESKTOP)
+    include_directories("${PROJECT_BINARY_DIR}/3party/gflags/include")
+  endif()
+
   # Add pugixml library.
   add_subdirectory(3party/pugixml)
 
@@ -325,14 +334,6 @@ endif()
 add_subdirectory(3party/agg)
 add_subdirectory(3party/bsdiff-courgette)
 
-add_subdirectory(3party/gflags)
-target_compile_options(gflags_nothreads_static PRIVATE $<$<CXX_COMPILER_ID:GNU>:-Wno-subobject-linkage>)
-# Not needed for the usual build process, but it fixes QtCreator editor,
-# that doesn't see gflags/gflags.h in binary dir (gflags has tricky cmake configuration).
-if (PLATFORM_DESKTOP)
-  include_directories("${PROJECT_BINARY_DIR}/3party/gflags/include")
-endif()
-
 if (LINUX_DETECTED)
   find_package(ICU COMPONENTS uc i18n data REQUIRED)
   find_package(Freetype REQUIRED)

diff --git a/generator/complex_generator/complex_generator.cpp b/generator/complex_generator/complex_generator.cpp
@@ -43,7 +43,7 @@
 
 #include "defines.hpp"
 
-#include "gflags/gflags.h"
+#include <gflags/gflags.h>
 
 DEFINE_string(node_storage, "map",
               "Type of storage for intermediate points representation. Available: raw, map, mem.");

diff --git a/generator/feature_segments_checker/feature_segments_checker.cpp b/generator/feature_segments_checker/feature_segments_checker.cpp
@@ -27,7 +27,7 @@
 #include <set>
 #include <string>
 
-#include "gflags/gflags.h"
+#include <gflags/gflags.h>
 
 DEFINE_string(srtm_dir_path, "", "Path to directory with SRTM files");
 DEFINE_string(mwm_file_path, "", "Path to an mwm file.");

diff --git a/generator/generator_tool/generator_tool.cpp b/generator/generator_tool/generator_tool.cpp
@@ -61,7 +61,7 @@
 #include <memory>
 #include <string>
 
-#include "gflags/gflags.h"
+#include <gflags/gflags.h>
 
 namespace
 {

diff --git a/generator/srtm_coverage_checker/srtm_coverage_checker.cpp b/generator/srtm_coverage_checker/srtm_coverage_checker.cpp
@@ -23,7 +23,7 @@
 #include <limits>
 #include <vector>
 
-#include "gflags/gflags.h"
+#include <gflags/gflags.h>
 
 DEFINE_string(srtm_path, "", "Path to directory with SRTM files");
 DEFINE_string(mwm_path, "", "Path to mwm files (writable dir)");

diff --git a/generator/world_roads_builder/world_roads_builder_tool/world_roads_builder_tool.cpp b/generator/world_roads_builder/world_roads_builder_tool/world_roads_builder_tool.cpp
@@ -20,7 +20,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "gflags/gflags.h"
+#include <gflags/gflags.h>
 
 
 DEFINE_string(path_resources, "", "OMaps resources directory");

diff --git a/map/benchmark_tool/main.cpp b/map/benchmark_tool/main.cpp
@@ -5,7 +5,7 @@
 
 #include <iostream>
 
-#include "gflags/gflags.h"
+#include <gflags/gflags.h>
 
 using namespace std;
 

diff --git a/map/extrapolation_benchmark/extrapolation_benchmark.cpp b/map/extrapolation_benchmark/extrapolation_benchmark.cpp
@@ -22,7 +22,7 @@
 #include <utility>
 #include <vector>
 
-#include "gflags/gflags.h"
+#include <gflags/gflags.h>
 #include "gflags/gflags_declare.h"
 
 // This tool is written to estimate quality of location extrapolation. To launch the benchmark

diff --git a/mapshot/mapshot.cpp b/mapshot/mapshot.cpp
@@ -16,7 +16,7 @@
 #include <iostream>
 #include <string>
 
-#include "gflags/gflags.h"
+#include <gflags/gflags.h>
 
 #pragma mark Define options
 //----------------------------------------------------------------------------------------

diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/main.cpp b/openlr/openlr_match_quality/openlr_assessment_tool/main.cpp
@@ -2,7 +2,7 @@
 
 #include "openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.hpp"
 
-#include "gflags/gflags.h"
+#include <gflags/gflags.h>
 
 #include <cstdio>
 

diff --git a/openlr/openlr_stat/openlr_stat.cpp b/openlr/openlr_stat/openlr_stat.cpp
@@ -28,7 +28,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "gflags/gflags.h"
+#include <gflags/gflags.h>
 #include <pugixml.hpp>
 
 DEFINE_string(input, "", "Path to OpenLR file.");

diff --git a/poly_borders/poly_borders_tool/poly_borders_tool.cpp b/poly_borders/poly_borders_tool/poly_borders_tool.cpp
@@ -9,7 +9,7 @@
 
 #include <exception>
 
-#include "gflags/gflags.h"
+#include <gflags/gflags.h>
 
 DEFINE_string(borders_path, "", "Path to directory with *.poly files.");
 DEFINE_string(output_path, "", "Path to target directory where the output *.poly files will be placed.");

diff --git a/qt/main.cpp b/qt/main.cpp
@@ -18,7 +18,7 @@
 #include <cstdlib>
 #include <sstream>
 
-#include "gflags/gflags.h"
+#include <gflags/gflags.h>
 
 #include <QtCore/QDir>
 #include <QtGui/QScreen>

diff --git a/routing/routes_builder/routes_builder_tool/routes_builder_tool.cpp b/routing/routes_builder/routes_builder_tool/routes_builder_tool.cpp
@@ -12,7 +12,7 @@
 #include <utility>
 #include <vector>
 
-#include "gflags/gflags.h"
+#include <gflags/gflags.h>
 
 DEFINE_uint64(threads, 0,
               "The number of threads. std::thread::hardware_concurrency() is used by default.");

diff --git a/routing/routing_consistency_tests/routing_consistency_tests.cpp b/routing/routing_consistency_tests/routing_consistency_tests.cpp
@@ -16,7 +16,7 @@
 #include <map>
 #include <string>
 
-#include "gflags/gflags.h"
+#include <gflags/gflags.h>
 
 namespace routing_consistency_tests
 {

diff --git a/routing/routing_quality/routing_quality_tool/routing_quality_tool.cpp b/routing/routing_quality/routing_quality_tool/routing_quality_tool.cpp
@@ -20,7 +20,7 @@
 #include <utility>
 #include <vector>
 
-#include "gflags/gflags.h"
+#include <gflags/gflags.h>
 
 DEFINE_string(mapsme_old_results, "", "Path to directory with previous mapsme router results.");
 DEFINE_string(mapsme_results, "", "Path to directory with mapsme router results.");

diff --git a/search/search_quality/assessment_tool/assessment_tool.cpp b/search/search_quality/assessment_tool/assessment_tool.cpp
@@ -12,7 +12,7 @@
 #include <QtGui/QScreen>
 #include <QtWidgets/QApplication>
 
-#include "gflags/gflags.h"
+#include <gflags/gflags.h>
 
 DEFINE_string(resources_path, "", "Path to resources directory");
 DEFINE_string(data_path, "", "Path to data directory");

diff --git a/search/search_quality/features_collector_tool/features_collector_tool.cpp b/search/search_quality/features_collector_tool/features_collector_tool.cpp
@@ -26,7 +26,7 @@
 #include <string>
 #include <vector>
 
-#include "gflags/gflags.h"
+#include <gflags/gflags.h>
 
 using namespace search::search_quality;
 using namespace search::tests_support;

diff --git a/search/search_quality/samples_generation_tool/samples_generation_tool.cpp b/search/search_quality/samples_generation_tool/samples_generation_tool.cpp
@@ -30,7 +30,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "gflags/gflags.h"
+#include <gflags/gflags.h>
 
 using namespace search::search_quality;
 using namespace search;

diff --git a/search/search_quality/search_quality_tool/search_quality_tool.cpp b/search/search_quality/search_quality_tool/search_quality_tool.cpp
@@ -39,7 +39,7 @@
 #include <string>
 #include <vector>
 
-#include "gflags/gflags.h"
+#include <gflags/gflags.h>
 
 using namespace search::search_quality;
 using namespace search::tests_support;

diff --git a/skin_generator/main.cpp b/skin_generator/main.cpp
@@ -11,7 +11,7 @@
 #include <QtXml/QXmlSimpleReader>
 #include <QtXml/QXmlInputSource>
 
-#include "gflags/gflags.h"
+#include <gflags/gflags.h>
 
 DEFINE_string(fontFileName, "../../data/01_dejavusans.ttf", "path to TrueType font file");
 DEFINE_string(symbolsFile, "../../data/results.unicode", "file with 2bytes symbols for which the skin should be generated");

diff --git a/topography_generator/main.cpp b/topography_generator/main.cpp
@@ -3,7 +3,7 @@
 #include "base/assert.hpp"
 #include "base/logging.hpp"
 
-#include "gflags/gflags.h"
+#include <gflags/gflags.h>
 
 #include <cstdlib>
 

diff --git a/track_analyzing/track_analyzer/track_analyzer.cpp b/track_analyzing/track_analyzer/track_analyzer.cpp
@@ -9,7 +9,7 @@
 
 #include "base/checked_cast.hpp"
 
-#include "gflags/gflags.h"
+#include <gflags/gflags.h>
 
 #include <string>
 

diff --git a/track_generator/track_generator_tool.cpp b/track_generator/track_generator_tool.cpp
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "gflags/gflags.h"
+#include <gflags/gflags.h>
 
 DEFINE_string(inputDir, "", "Path to kmls.");
 

diff --git a/transit/world_feed/gtfs_converter/gtfs_converter.cpp b/transit/world_feed/gtfs_converter/gtfs_converter.cpp
@@ -11,7 +11,7 @@
 #include "base/logging.hpp"
 #include "base/timer.hpp"
 
-#include "gflags/gflags.h"
+#include <gflags/gflags.h>
 
 DEFINE_string(
     path_mapping, "",