From d28670d908d65e3c2c28efa7ac341ae297ee7c42 Mon Sep 17 00:00:00 2001
From: Gold856 <117957790+Gold856@users.noreply.github.com>
Date: Thu, 4 Jul 2024 17:08:51 -0400
Subject: [PATCH] Remove extra directories in target_include_directories

---
 wpinet/CMakeLists.txt  |  2 --
 wpiutil/CMakeLists.txt | 24 +++++-------------------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/wpinet/CMakeLists.txt b/wpinet/CMakeLists.txt
index d4e14e7528b..bddb4db83a9 100644
--- a/wpinet/CMakeLists.txt
+++ b/wpinet/CMakeLists.txt
@@ -144,7 +144,6 @@ if(NOT USE_SYSTEM_LIBUV)
         wpinet
         PUBLIC
             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/libuv/include>
-            $<INSTALL_INTERFACE:${include_dest}/wpinet>
     )
     if(NOT MSVC)
         target_sources(wpinet PRIVATE ${uv_unix_src})
@@ -184,7 +183,6 @@ target_include_directories(
     wpinet
     PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/tcpsockets/include>
-        $<INSTALL_INTERFACE:${include_dest}/wpinet>
 )
 
 install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/wpinet")
diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt
index 812db4c5e7e..e20754db214 100644
--- a/wpiutil/CMakeLists.txt
+++ b/wpiutil/CMakeLists.txt
@@ -172,7 +172,6 @@ if(NOT USE_SYSTEM_FMTLIB)
         wpiutil
         PUBLIC
             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/fmtlib/include>
-            $<INSTALL_INTERFACE:${include_dest}/wpiutil>
     )
 else()
     find_package(fmt CONFIG REQUIRED)
@@ -204,49 +203,36 @@ install(
 target_include_directories(
     wpiutil
     PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/expected/include>
-        $<INSTALL_INTERFACE:${include_dest}/wpiutil>
 )
 install(DIRECTORY src/main/native/thirdparty/memory/include/ DESTINATION "${include_dest}/wpiutil")
 target_include_directories(
     wpiutil
-    PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include>
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/memory/include>
-        $<INSTALL_INTERFACE:${include_dest}/wpiutil>
+    PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/memory/include>
 )
 
 install(DIRECTORY src/main/native/thirdparty/json/include/ DESTINATION "${include_dest}/wpiutil")
 target_include_directories(
     wpiutil
-    PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/json/include>
-        $<INSTALL_INTERFACE:${include_dest}/wpiutil>
+    PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/json/include>
 )
 
 install(DIRECTORY src/main/native/thirdparty/llvm/include/ DESTINATION "${include_dest}/wpiutil")
 target_include_directories(
     wpiutil
-    PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/llvm/include>
-        $<INSTALL_INTERFACE:${include_dest}/wpiutil>
+    PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/llvm/include>
 )
 
 install(DIRECTORY src/main/native/thirdparty/mpack/include/ DESTINATION "${include_dest}/wpiutil")
 target_include_directories(
     wpiutil
-    PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/mpack/include>
-        $<INSTALL_INTERFACE:${include_dest}/wpiutil>
+    PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/mpack/include>
 )
 
 install(DIRECTORY src/main/native/thirdparty/sigslot/include/ DESTINATION "${include_dest}/wpiutil")
 target_include_directories(
     wpiutil
-    PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/sigslot/include>
-        $<INSTALL_INTERFACE:${include_dest}/wpiutil>
+    PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/thirdparty/sigslot/include>
 )
 
 install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/wpiutil")