[CMAKE] Use CMAKE_CURRENT_SOURCE_DIR instead of dot for current directories (#812)

xezon · web-flow · commit dfef05f99179 · 2025-05-04T20:27:38.000+02:00
diff --git a/Core/Libraries/Source/Compression/CMakeLists.txt b/Core/Libraries/Source/Compression/CMakeLists.txt
@@ -25,7 +25,7 @@ set_target_properties(core_compression PROPERTIES OUTPUT_NAME compression)
 target_sources(core_compression PRIVATE ${COMPRESSION_SRC})
 
 target_include_directories(core_compression INTERFACE
-    .
+    ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 target_link_libraries(core_compression PRIVATE
diff --git a/Core/Libraries/Source/WWVegas/CMakeLists.txt b/Core/Libraries/Source/WWVegas/CMakeLists.txt
@@ -15,7 +15,7 @@ target_link_libraries(core_wwcommon INTERFACE
 )
 
 target_include_directories(core_wwcommon INTERFACE
-    .
+    ${CMAKE_CURRENT_SOURCE_DIR}
     # WW3D2
     WWAudio
     WWDebug
@@ -38,7 +38,7 @@ add_subdirectory(WWStub)
 add_library(core_wwvegas INTERFACE)
 
 target_include_directories(core_wwvegas INTERFACE
-    .
+    ${CMAKE_CURRENT_SOURCE_DIR}
     #WW3D2
     WWAudio
     WWDebug
diff --git a/Core/Libraries/Source/WWVegas/WWLib/CMakeLists.txt b/Core/Libraries/Source/WWVegas/WWLib/CMakeLists.txt
@@ -162,7 +162,7 @@ set_target_properties(core_wwlib PROPERTIES OUTPUT_NAME wwlib)
 target_sources(core_wwlib PRIVATE ${WWLIB_SRC})
 
 target_include_directories(core_wwlib PUBLIC
-    .
+    ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 target_link_libraries(core_wwlib PRIVATE
diff --git a/Core/Tools/mangler/CMakeLists.txt b/Core/Tools/mangler/CMakeLists.txt
@@ -60,7 +60,11 @@ add_library(core_manglerlib STATIC)
 set_target_properties(core_manglerlib PROPERTIES OUTPUT_NAME manglerlib)
 
 target_sources(core_manglerlib PUBLIC ${MANGLERLIB_SRC})
-target_include_directories(core_manglerlib PRIVATE . wlib wnet)
+target_include_directories(core_manglerlib PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    wlib
+    wnet
+)
 target_link_libraries(core_manglerlib PRIVATE wsock32)
 target_link_libraries(core_manglerlib PUBLIC
     core_config
@@ -73,7 +77,11 @@ add_executable(core_mangler WIN32)
 set_target_properties(core_mangler PROPERTIES OUTPUT_NAME mangler)
 
 target_sources(core_mangler PRIVATE ${MANGLER_SRC})
-target_include_directories(core_mangler PRIVATE . wlib wnet)
+target_include_directories(core_mangler PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    wlib
+    wnet
+)
 target_link_libraries(core_mangler PRIVATE core_manglerlib)
 
 if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
@@ -87,7 +95,11 @@ add_executable(core_manglertest WIN32)
 set_target_properties(core_manglertest PROPERTIES OUTPUT_NAME manglertest)
 
 target_sources(core_manglertest PRIVATE ${MANGLERTEST_SRC})
-target_include_directories(core_manglertest PRIVATE . wlib wnet)
+target_include_directories(core_manglertest PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    wlib
+    wnet
+)
 target_link_libraries(core_manglertest PRIVATE core_manglerlib)
 
 if(WIN32 OR "${CMAKE_SYSTEM}" MATCHES "Windows")
diff --git a/Core/Tools/matchbot/CMakeLists.txt b/Core/Tools/matchbot/CMakeLists.txt
@@ -64,7 +64,11 @@ set_target_properties(core_matchbot PROPERTIES OUTPUT_NAME matchbot)
 
 target_sources(core_matchbot PRIVATE ${MATCHBOT_SRC})
 
-target_include_directories(core_matchbot PRIVATE . wlib wnet)
+target_include_directories(core_matchbot PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    wlib
+    wnet
+)
 
 target_link_libraries(core_matchbot PRIVATE
     gamespy::gamespy
diff --git a/Dependencies/SafeDisc/CMakeLists.txt b/Dependencies/SafeDisc/CMakeLists.txt
@@ -1,2 +1,4 @@
 add_library(safedisc INTERFACE)
-target_include_directories(safedisc INTERFACE .)
+target_include_directories(safedisc INTERFACE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
diff --git a/Generals/Code/Libraries/Source/WWVegas/CMakeLists.txt b/Generals/Code/Libraries/Source/WWVegas/CMakeLists.txt
@@ -11,7 +11,7 @@ target_link_libraries(g_wwcommon INTERFACE
 )
 
 target_include_directories(g_wwcommon INTERFACE
-    .
+    ${CMAKE_CURRENT_SOURCE_DIR}
     WW3D2
 )
 
@@ -23,7 +23,7 @@ add_subdirectory(WWDownload)
 add_library(g_wwvegas INTERFACE)
 
 target_include_directories(g_wwvegas INTERFACE
-    .
+    ${CMAKE_CURRENT_SOURCE_DIR}
     WW3D2
 )
 
diff --git a/Generals/Code/Tools/WorldBuilder/CMakeLists.txt b/Generals/Code/Tools/WorldBuilder/CMakeLists.txt
@@ -197,7 +197,7 @@ set(WORLDBUILDER_SRC
 add_executable(g_worldbuilder WIN32)
 
 target_include_directories(g_worldbuilder PRIVATE
-    .
+    ${CMAKE_CURRENT_SOURCE_DIR}
     include
     res
 )
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/CMakeLists.txt b/GeneralsMD/Code/Libraries/Source/WWVegas/CMakeLists.txt
@@ -11,7 +11,7 @@ target_link_libraries(z_wwcommon INTERFACE
 )
 
 target_include_directories(z_wwcommon INTERFACE
-    .
+    ${CMAKE_CURRENT_SOURCE_DIR}
     WW3D2
 )
 
@@ -23,7 +23,7 @@ add_subdirectory(WWDownload)
 add_library(z_wwvegas INTERFACE)
 
 target_include_directories(z_wwvegas INTERFACE
-    .
+    ${CMAKE_CURRENT_SOURCE_DIR}
     WW3D2
 )
 
diff --git a/GeneralsMD/Code/Libraries/Source/debug/CMakeLists.txt b/GeneralsMD/Code/Libraries/Source/debug/CMakeLists.txt
@@ -29,7 +29,7 @@ add_library(z_debug STATIC)
 target_sources(z_debug PRIVATE ${DEBUG_SRC})
 
 target_include_directories(z_debug INTERFACE
-    .
+    ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 target_link_libraries(z_debug PRIVATE
diff --git a/GeneralsMD/Code/Libraries/Source/profile/CMakeLists.txt b/GeneralsMD/Code/Libraries/Source/profile/CMakeLists.txt
@@ -23,7 +23,7 @@ add_library(z_profile STATIC)
 target_sources(z_profile PRIVATE ${PROFILE_SRC})
 
 target_include_directories(z_profile INTERFACE
-    .
+    ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 target_link_libraries(z_profile PRIVATE
diff --git a/GeneralsMD/Code/Main/CMakeLists.txt b/GeneralsMD/Code/Main/CMakeLists.txt
@@ -50,7 +50,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/BuildVersion.h
 target_link_options(z_generals PRIVATE "/NODEFAULTLIB:libci.lib")
 
 target_include_directories(z_generals PRIVATE
-    .
+    ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/CMakeLists.txt b/GeneralsMD/Code/Tools/WorldBuilder/CMakeLists.txt
@@ -204,7 +204,7 @@ add_executable(z_worldbuilder WIN32)
 target_sources(z_worldbuilder PRIVATE ${WORLDBUILDER_SRC})
 
 target_include_directories(z_worldbuilder PRIVATE
-    .
+    ${CMAKE_CURRENT_SOURCE_DIR}
     include
     res
 )

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ set_target_properties(core_compression PROPERTIES OUTPUT_NAME compression)`
`25`	`25`	`target_sources(core_compression PRIVATE ${COMPRESSION_SRC})`
`26`	`26`
`27`	`27`	`target_include_directories(core_compression INTERFACE`
`28`		`- .`
	`28`	`+ ${CMAKE_CURRENT_SOURCE_DIR}`
`29`	`29`	`)`
`30`	`30`
`31`	`31`	`target_link_libraries(core_compression PRIVATE`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ set_target_properties(core_wwlib PROPERTIES OUTPUT_NAME wwlib)`
`162`	`162`	`target_sources(core_wwlib PRIVATE ${WWLIB_SRC})`
`163`	`163`
`164`	`164`	`target_include_directories(core_wwlib PUBLIC`
`165`		`- .`
	`165`	`+ ${CMAKE_CURRENT_SOURCE_DIR}`
`166`	`166`	`)`
`167`	`167`
`168`	`168`	`target_link_libraries(core_wwlib PRIVATE`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ target_link_libraries(g_wwcommon INTERFACE`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`target_include_directories(g_wwcommon INTERFACE`
`14`		`- .`
	`14`	`+ ${CMAKE_CURRENT_SOURCE_DIR}`
`15`	`15`	`WW3D2`
`16`	`16`	`)`
`17`	`17`
`@@ -23,7 +23,7 @@ add_subdirectory(WWDownload)`
`23`	`23`	`add_library(g_wwvegas INTERFACE)`
`24`	`24`
`25`	`25`	`target_include_directories(g_wwvegas INTERFACE`
`26`		`- .`
	`26`	`+ ${CMAKE_CURRENT_SOURCE_DIR}`
`27`	`27`	`WW3D2`
`28`	`28`	`)`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ set(WORLDBUILDER_SRC`
`197`	`197`	`add_executable(g_worldbuilder WIN32)`
`198`	`198`
`199`	`199`	`target_include_directories(g_worldbuilder PRIVATE`
`200`		`- .`
	`200`	`+ ${CMAKE_CURRENT_SOURCE_DIR}`
`201`	`201`	`include`
`202`	`202`	`res`
`203`	`203`	`)`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ add_library(z_debug STATIC)`
`29`	`29`	`target_sources(z_debug PRIVATE ${DEBUG_SRC})`
`30`	`30`
`31`	`31`	`target_include_directories(z_debug INTERFACE`
`32`		`- .`
	`32`	`+ ${CMAKE_CURRENT_SOURCE_DIR}`
`33`	`33`	`)`
`34`	`34`
`35`	`35`	`target_link_libraries(z_debug PRIVATE`