Merge pull request #10260 from hzeller/feature-20260425-lodepng

Make includes comgin from third-party/ more specific.

Author: maliberty

src/gui/CMakeLists.txt

@@ -175,7 +175,7 @@ else()
   )
   target_include_directories(gui
     PRIVATE
-      ${OPENROAD_HOME}/third-party/gif-h
+      ${OPENROAD_HOME}
   )
 endif()
 
@@ -185,7 +185,7 @@ target_include_directories(gui
   PRIVATE
     ${OPENSTA_HOME}/include
     ${DBSTA_HOME}/include
-    ${OPENROAD_HOME}/third-party/gif-h
+    ${OPENROAD_HOME}
 )
 
 add_subdirectory(test)

src/gui/src/gui.cpp

@@ -38,7 +38,6 @@
 #include "clockWidget.h"
 #include "displayControls.h"
 #include "drcWidget.h"
-#include "gif.h"
 #include "heatMapGui.h"
 #include "helpWidget.h"
 #include "inspector.h"
@@ -51,6 +50,7 @@
 #include "ord/OpenRoad.hh"
 #include "ruler.h"
 #include "scriptWidget.h"
+#include "third-party/gif-h/gif.h"
 #include "timingWidget.h"
 #include "utl/Logger.h"
 #include "utl/decode.h"

src/web/src/tile_generator.cpp

@@ -23,7 +23,6 @@
 #include "gui/gui.h"
 #include "gui/heatMap.h"
 #include "json_builder.h"
-#include "lodepng.h"
 #include "odb/db.h"
 #include "odb/dbSet.h"
 #include "odb/dbShape.h"
@@ -32,6 +31,7 @@
 #include "odb/geom.h"
 #include "request_handler.h"
 #include "search.h"
+#include "third-party/lodepng/lodepng.h"
 #include "timing_report.h"
 #include "utl/Logger.h"
 #include "web_painter.h"

src/web/test/cpp/TestSaveImage.cpp

@@ -11,10 +11,10 @@
 #include <vector>
 
 #include "gtest/gtest.h"
-#include "lodepng.h"
 #include "odb/db.h"
 #include "odb/dbTypes.h"
 #include "odb/geom.h"
+#include "third-party/lodepng/lodepng.h"
 #include "tile_generator.h"
 #include "tst/nangate45_fixture.h"
 

src/web/test/cpp/TestTileGenerator.cpp

@@ -9,10 +9,10 @@
 #include <vector>
 
 #include "gtest/gtest.h"
-#include "lodepng.h"
 #include "odb/db.h"
 #include "odb/dbTypes.h"
 #include "odb/geom.h"
+#include "third-party/lodepng/lodepng.h"
 #include "tile_generator.h"
 #include "tst/nangate45_fixture.h"
 

third-party/gif-h/BUILD.bazel

@@ -6,7 +6,6 @@ load("@rules_cc//cc:cc_library.bzl", "cc_library")
 cc_library(
     name = "gif_h",
     hdrs = ["gif.h"],
-    includes = ["."],
     visibility = ["//visibility:public"],
     alwayslink = True,
 )

third-party/lodepng/BUILD

@@ -7,6 +7,5 @@ cc_library(
     name = "lodepng",
     srcs = ["lodepng.cpp"],
     hdrs = ["lodepng.h"],
-    includes = ["."],
     visibility = ["//visibility:public"],
 )

third-party/lodepng/CMakeLists.txt

@@ -7,5 +7,5 @@ add_library(lodepng
 
 target_include_directories(lodepng
   PUBLIC
-    .
+    ${OPENROAD_HOME}
 )