[CMake] Remove unnecessary {g,z}i_libraries_source (#624)

zzambers · xezon · commit 7c8b473d4b6f · 2025-04-08T08:33:20.000+02:00
diff --git a/Generals/Code/CMakeLists.txt b/Generals/Code/CMakeLists.txt
@@ -3,7 +3,6 @@ add_library(gi_gameengine INTERFACE)
 add_library(gi_gameengine_include INTERFACE)
 add_library(gi_gameenginedevice_include INTERFACE)
 add_library(gi_libraries_include INTERFACE)
-add_library(gi_libraries_source INTERFACE)
 add_library(gi_libraries_source_wwvegas INTERFACE)
 add_library(gi_libraries_source_wwvegas_ww3d2 INTERFACE)
 add_library(gi_libraries_source_wwvegas_wwdebug INTERFACE)
@@ -16,7 +15,6 @@ target_include_directories(gi_gameengine INTERFACE "GameEngine")
 target_include_directories(gi_gameengine_include INTERFACE "GameEngine/Include")
 target_include_directories(gi_gameenginedevice_include INTERFACE "GameEngineDevice/Source")
 target_include_directories(gi_libraries_include INTERFACE "Libraries/Include")
-target_include_directories(gi_libraries_source INTERFACE "Libraries/Source")
 target_include_directories(gi_libraries_source_wwvegas INTERFACE "Libraries/Source/WWVegas")
 target_include_directories(gi_libraries_source_wwvegas_ww3d2 INTERFACE "Libraries/Source/WWVegas/WW3D2")
 target_include_directories(gi_libraries_source_wwvegas_wwdebug INTERFACE "Libraries/Source/WWVegas/WWDebug")
diff --git a/Generals/Code/GameEngine/CMakeLists.txt b/Generals/Code/GameEngine/CMakeLists.txt
@@ -1084,7 +1084,6 @@ target_include_directories(g_gameengine PRIVATE
 
 target_link_libraries(g_gameengine PRIVATE
     gi_libraries_include
-    gi_libraries_source
 )
 
 target_link_libraries(g_gameengine PUBLIC
diff --git a/Generals/Code/GameEngineDevice/CMakeLists.txt b/Generals/Code/GameEngineDevice/CMakeLists.txt
@@ -193,7 +193,6 @@ target_include_directories(g_gameenginedevice PUBLIC
 
 target_link_libraries(g_gameenginedevice PRIVATE
     gi_libraries_include
-    gi_libraries_source
     gi_main
 )
 
diff --git a/Generals/Code/Main/CMakeLists.txt b/Generals/Code/Main/CMakeLists.txt
@@ -18,7 +18,6 @@ target_link_libraries(g_generals PRIVATE
     g_gameengine
     g_gameenginedevice
     gi_libraries_include
-    gi_libraries_source
     imm32
     milesstub
     safedisc
diff --git a/Generals/Code/Tools/Compress/CMakeLists.txt b/Generals/Code/Tools/Compress/CMakeLists.txt
@@ -12,7 +12,6 @@ target_sources(g_compress PRIVATE ${COMRPESS_SRC})
 target_link_libraries(g_compress PRIVATE
     g_compression
     gi_libraries_include
-    gi_libraries_source
     gz_config
 )
 
diff --git a/Generals/Code/Tools/Compress/Compress.cpp b/Generals/Code/Tools/Compress/Compress.cpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <cstdio>
 #include "Lib/BaseType.h"
-#include "Compression/Compression.h"
+#include "Compression.h"
 #include "../CRCDiff/debug.h"
 
 #ifndef DEBUG
diff --git a/GeneralsMD/Code/CMakeLists.txt b/GeneralsMD/Code/CMakeLists.txt
@@ -3,7 +3,6 @@ add_library(zi_gameengine INTERFACE)
 add_library(zi_gameengine_include INTERFACE)
 add_library(zi_gameenginedevice_include INTERFACE)
 add_library(zi_libraries_include INTERFACE)
-add_library(zi_libraries_source INTERFACE)
 add_library(zi_libraries_source_wwvegas INTERFACE)
 add_library(zi_libraries_source_wwvegas_ww3d2 INTERFACE)
 add_library(zi_libraries_source_wwvegas_wwdebug INTERFACE)
@@ -16,7 +15,6 @@ target_include_directories(zi_gameengine INTERFACE "GameEngine")
 target_include_directories(zi_gameengine_include INTERFACE "GameEngine/Include")
 target_include_directories(zi_gameenginedevice_include INTERFACE "GameEngineDevice/Source")
 target_include_directories(zi_libraries_include INTERFACE "Libraries/Include")
-target_include_directories(zi_libraries_source INTERFACE "Libraries/Source")
 target_include_directories(zi_libraries_source_wwvegas INTERFACE "Libraries/Source/WWVegas")
 target_include_directories(zi_libraries_source_wwvegas_ww3d2 INTERFACE "Libraries/Source/WWVegas/WW3D2")
 target_include_directories(zi_libraries_source_wwvegas_wwdebug INTERFACE "Libraries/Source/WWVegas/WWDebug")
diff --git a/GeneralsMD/Code/GameEngine/CMakeLists.txt b/GeneralsMD/Code/GameEngine/CMakeLists.txt
@@ -1167,7 +1167,6 @@ target_include_directories(z_gameengine PRIVATE
 
 target_link_libraries(z_gameengine PRIVATE
     zi_libraries_include
-    zi_libraries_source
 )
 
 target_link_libraries(z_gameengine PUBLIC
diff --git a/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt b/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
@@ -206,7 +206,6 @@ target_include_directories(z_gameenginedevice PUBLIC
 
 target_link_libraries(z_gameenginedevice PRIVATE
     zi_libraries_include
-    zi_libraries_source
     zi_main
 )
 
diff --git a/GeneralsMD/Code/Main/CMakeLists.txt b/GeneralsMD/Code/Main/CMakeLists.txt
@@ -25,7 +25,6 @@ target_link_libraries(z_generals PRIVATE
     z_gameenginedevice
     z_profile
     zi_libraries_include
-    zi_libraries_source
 )
 
 # TODO Originally referred to build host and user, replace with git info perhaps?
diff --git a/GeneralsMD/Code/Tools/Compress/CMakeLists.txt b/GeneralsMD/Code/Tools/Compress/CMakeLists.txt
@@ -13,7 +13,6 @@ target_link_libraries(z_compress PRIVATE
     gz_config
     z_compression
     zi_libraries_include
-    zi_libraries_source
 )
 
 if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
diff --git a/GeneralsMD/Code/Tools/Compress/Compress.cpp b/GeneralsMD/Code/Tools/Compress/Compress.cpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <cstdio>
 #include "Lib/BaseType.h"
-#include "Compression/Compression.h"
+#include "Compression.h"
 #include "../CRCDiff/debug.h"
 
 #ifndef DEBUG

Original file line number	Diff line number	Diff line change
`@@ -1084,7 +1084,6 @@ target_include_directories(g_gameengine PRIVATE`
`1084`	`1084`
`1085`	`1085`	`target_link_libraries(g_gameengine PRIVATE`
`1086`	`1086`	`gi_libraries_include`
`1087`		`- gi_libraries_source`
`1088`	`1087`	`)`
`1089`	`1088`
`1090`	`1089`	`target_link_libraries(g_gameengine PUBLIC`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,6 @@ target_include_directories(g_gameenginedevice PUBLIC`
`193`	`193`
`194`	`194`	`target_link_libraries(g_gameenginedevice PRIVATE`
`195`	`195`	`gi_libraries_include`
`196`		`- gi_libraries_source`
`197`	`196`	`gi_main`
`198`	`197`	`)`
`199`	`198`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ target_sources(g_compress PRIVATE ${COMRPESS_SRC})`
`12`	`12`	`target_link_libraries(g_compress PRIVATE`
`13`	`13`	`g_compression`
`14`	`14`	`gi_libraries_include`
`15`		`- gi_libraries_source`
`16`	`15`	`gz_config`
`17`	`16`	`)`
`18`	`17`
Original file line number	Diff line number	Diff line change
`@@ -1167,7 +1167,6 @@ target_include_directories(z_gameengine PRIVATE`
`1167`	`1167`
`1168`	`1168`	`target_link_libraries(z_gameengine PRIVATE`
`1169`	`1169`	`zi_libraries_include`
`1170`		`- zi_libraries_source`
`1171`	`1170`	`)`
`1172`	`1171`
`1173`	`1172`	`target_link_libraries(z_gameengine PUBLIC`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,6 @@ target_include_directories(z_gameenginedevice PUBLIC`
`206`	`206`
`207`	`207`	`target_link_libraries(z_gameenginedevice PRIVATE`
`208`	`208`	`zi_libraries_include`
`209`		`- zi_libraries_source`
`210`	`209`	`zi_main`
`211`	`210`	`)`
`212`	`211`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ target_link_libraries(z_generals PRIVATE`
`25`	`25`	`z_gameenginedevice`
`26`	`26`	`z_profile`
`27`	`27`	`zi_libraries_include`
`28`		`- zi_libraries_source`
`29`	`28`	`)`
`30`	`29`
`31`	`30`	`# TODO Originally referred to build host and user, replace with git info perhaps?`