Premake: Add include guard to make sure dependencies do not include themselves in an infinite chain when two components depend on each other

premake5.lua

@@ -19,6 +19,37 @@ function TestFolder()
 	return path.getrelative(os.getcwd(), _TestFolder)
 end
 
+-- Functions for including projects
+References = {
+    includeList = {},
+    linkList = {}
+}
+
+function References:include(name)
+    result = self.includeList[name] == nil
+
+    if result then
+        self.includeList[name] = true
+    end
+
+    return result
+end
+
+function References:link(name)
+    result = self.linkList[name] == nil
+
+    if result then
+        self.linkList[name] = true
+    end
+
+    return result
+end
+
+function References:reset()
+    self.includeList = {}
+    self.linkList = {}
+end
+
 -- Target Directories
 TargetDirectoryBin = "%{wks.location}/bin/%{cfg.buildcfg}_%{cfg.platform}"
 TargetDirectoryLib = "%{wks.location}/lib/%{cfg.buildcfg}_%{cfg.platform}"

src/Crypto.lua

@@ -1,16 +1,20 @@
 Crypto = {}
 
 function Crypto:include()
-	includedirs {
-		path.join(ProjectFolder(), "Crypto")
-	}
+	if References:include("Crypto") then
+		includedirs {
+			path.join(ProjectFolder(), "Crypto")
+		}
+	end
 end
 
 function Crypto:link()
-    libtomcrypt:link()
-	libtommath:link()
-	salsa20:link()
-	links "Crypto"
+	if References:link("Crypto") then
+		libtomcrypt:link()
+		libtommath:link()
+		salsa20:link()
+		links "Crypto"
+	end
 end
 
 function Crypto:use()
@@ -18,6 +22,7 @@ function Crypto:use()
 end
 
 function Crypto:project()
+	References:reset()
 	local folder = ProjectFolder();
 
 	project "Crypto"

src/Linker.lua

@@ -1,9 +1,11 @@
 Linker = {}
 
 function Linker:include()
-	includedirs {
-		path.join(ProjectFolder(), "Linker")
-	}
+	if References:include("Linker") then
+		includedirs {
+			path.join(ProjectFolder(), "Linker")
+		}
+	end
 end
 
 function Linker:link()
@@ -15,6 +17,7 @@ function Linker:use()
 end
 
 function Linker:project()
+	References:reset()
 	local folder = ProjectFolder();
 
 	project "Linker"

src/ObjCommon.lua

@@ -1,20 +1,24 @@
 ObjCommon = {}
 
 function ObjCommon:include()
-	ZoneCommon:include()
-	minizip:include()
-	includedirs {
-		path.join(ProjectFolder(), "ObjCommon")
-	}
+	if References:include("ObjCommon") then
+		ZoneCommon:include()
+		minizip:include()
+		includedirs {
+			path.join(ProjectFolder(), "ObjCommon")
+		}
+	end
 end
 
 function ObjCommon:link()
-    Utils:link()
-	ZoneCommon:link()
-	minizip:link()
-	links {
-		"ObjCommon"
-	}
+	if References:link("ObjCommon") then
+		Utils:link()
+		ZoneCommon:link()
+		minizip:link()
+		links {
+			"ObjCommon"
+		}
+	end
 end
 
 function ObjCommon:use()
@@ -22,6 +26,7 @@ function ObjCommon:use()
 end
 
 function ObjCommon:project()
+	References:reset()
 	local folder = ProjectFolder();
 
 	project "ObjCommon"

src/ObjLoading.lua

@@ -1,23 +1,27 @@
 ObjLoading = {}
 
 function ObjLoading:include()
-	ObjCommon:include()
-	ZoneCommon:include()
-	includedirs {
-		path.join(ProjectFolder(), "ObjLoading")
-	}
+	if References:include("ObjLoading") then
+		ObjCommon:include()
+		ZoneCommon:include()
+		includedirs {
+			path.join(ProjectFolder(), "ObjLoading")
+		}
+	end
 end
 
 function ObjLoading:link()
-    Utils:link()
-	ObjCommon:link()
-	ZoneCommon:link()
-	minilzo:link()
-	minizip:link()
-	zlib:link()
-	links {
-		"ObjLoading"
-	}
+	if References:link("ObjLoading") then
+		Utils:link()
+		ObjCommon:link()
+		ZoneCommon:link()
+		minilzo:link()
+		minizip:link()
+		zlib:link()
+		links {
+			"ObjLoading"
+		}
+	end
 end
 
 function ObjLoading:use()
@@ -25,6 +29,7 @@ function ObjLoading:use()
 end
 
 function ObjLoading:project()
+	References:reset()
 	local folder = ProjectFolder();
 
 	project "ObjLoading"

src/ObjWriting.lua

@@ -1,22 +1,26 @@
 ObjWriting = {}
 
 function ObjWriting:include()
-	ObjCommon:include()
-	ZoneCommon:include()
-	includedirs {
-		path.join(ProjectFolder(), "ObjWriting")
-	}
+	if References:include("ObjWriting") then
+		ObjCommon:include()
+		ZoneCommon:include()
+		includedirs {
+			path.join(ProjectFolder(), "ObjWriting")
+		}
+	end
 end
 
 function ObjWriting:link()
-    Utils:link()
-	ObjCommon:link()
-	ZoneCommon:link()
-	minilzo:link()
-	minizip:link()
-	links {
-		"ObjWriting"
-	}
+	if References:link("ObjWriting") then
+		Utils:link()
+		ObjCommon:link()
+		ZoneCommon:link()
+		minilzo:link()
+		minizip:link()
+		links {
+			"ObjWriting"
+		}
+	end
 end
 
 function ObjWriting:use()
@@ -24,6 +28,7 @@ function ObjWriting:use()
 end
 
 function ObjWriting:project()
+	References:reset()
 	local folder = ProjectFolder();
 
 	project "ObjWriting"

src/Unlinker.lua

@@ -1,9 +1,11 @@
 Unlinker = {}
 
 function Unlinker:include()
-	includedirs {
-		path.join(ProjectFolder(), "Unlinker")
-	}
+	if References:include("Unlinker") then
+		includedirs {
+			path.join(ProjectFolder(), "Unlinker")
+		}
+	end
 end
 
 function Unlinker:link()
@@ -15,6 +17,7 @@ function Unlinker:use()
 end
 
 function Unlinker:project()
+	References:reset()
 	local folder = ProjectFolder();
 
 	project "Unlinker"

src/Utils.lua

@@ -1,13 +1,17 @@
 Utils = {}
 
 function Utils:include()
-	includedirs {
-		path.join(ProjectFolder(), "Utils")
-	}
+	if References:include("Utils") then
+		includedirs {
+			path.join(ProjectFolder(), "Utils")
+		}
+	end
 end
 
 function Utils:link()
-	links "Utils"
+	if References:link("Utils") then
+		links "Utils"
+	end
 end
 
 function Utils:use()
@@ -15,6 +19,7 @@ function Utils:use()
 end
 
 function Utils:project()
+	References:reset()
 	local folder = ProjectFolder();
 
 	project "Utils"

src/ZoneCode.lua

@@ -108,10 +108,12 @@ function ZoneCode:allWriteFiles()
 end
 
 function ZoneCode:include()
-	includedirs {
-		path.join(ProjectFolder(), "ZoneCode"),
-		"%{wks.location}/src/ZoneCode"
-	}
+	if References:include("ZoneCode") then
+        includedirs {
+            path.join(ProjectFolder(), "ZoneCode"),
+            "%{wks.location}/src/ZoneCode"
+        }
+    end
 end
 
 function ZoneCode:link()
@@ -123,6 +125,7 @@ function ZoneCode:use()
 end
 
 function ZoneCode:project()
+    References:reset()
 	local folder = ProjectFolder();
 
 	project "ZoneCode"

src/ZoneCodeGenerator.lua

@@ -5,7 +5,9 @@ function ZoneCodeGenerator:include()
 end
 
 function ZoneCodeGenerator:link()
-	links "ZoneCodeGenerator"
+	if References:link("ZoneCodeGenerator") then
+        links "ZoneCodeGenerator"
+    end
 end
 
 function ZoneCodeGenerator:use()
@@ -13,6 +15,7 @@ function ZoneCodeGenerator:use()
 end
 
 function ZoneCodeGenerator:project()
+    References:reset()
 	local folder = ProjectFolder();
 
 	project "ZoneCodeGenerator"

src/ZoneCommon.lua

@@ -1,17 +1,23 @@
 ZoneCommon = {}
 
 function ZoneCommon:include()
-	Utils:include()
-	includedirs {
-		path.join(ProjectFolder(), "ZoneCommon")
-	}
+	if References:include("ZoneCommon") then
+		Utils:include()
+		ObjCommon:include()
+		includedirs {
+			path.join(ProjectFolder(), "ZoneCommon")
+		}
+	end
 end
 
 function ZoneCommon:link()
-    Utils:link()
-	links {
-		"ZoneCommon"
-	}
+	if References:link("ZoneCommon") then
+		Utils:link()
+		ObjCommon:link()
+		links {
+			"ZoneCommon"
+		}
+	end
 end
 
 function ZoneCommon:use()
@@ -19,6 +25,7 @@ function ZoneCommon:use()
 end
 
 function ZoneCommon:project()
+	References:reset()
 	local folder = ProjectFolder();
 
 	project "ZoneCommon"

src/ZoneLoading.lua

@@ -1,20 +1,24 @@
 ZoneLoading = {}
 
 function ZoneLoading:include()
-	ZoneCommon:include()
-	includedirs {
-		path.join(ProjectFolder(), "ZoneLoading")
-	}
+	if References:include("ZoneLoading") then
+		ZoneCommon:include()
+		includedirs {
+			path.join(ProjectFolder(), "ZoneLoading")
+		}
+	end
 end
 
 function ZoneLoading:link()
-    Crypto:link()
-    Utils:link()
-	ZoneCommon:link()
-	zlib:link()
-	links {
-		"ZoneLoading"
-	}
+	if References:link("ZoneLoading") then
+		Crypto:link()
+		Utils:link()
+		ZoneCommon:link()
+		zlib:link()
+		links {
+			"ZoneLoading"
+		}
+	end
 end
 
 function ZoneLoading:use()
@@ -22,6 +26,7 @@ function ZoneLoading:use()
 end
 
 function ZoneLoading:project()
+	References:reset()
 	local folder = ProjectFolder();
 
 	project "ZoneLoading"

src/ZoneWriting.lua

@@ -1,20 +1,24 @@
 ZoneWriting = {}
 
 function ZoneWriting:include()
-	ZoneCommon:include()
-	includedirs {
-		path.join(ProjectFolder(), "ZoneWriting")
-	}
+	if References:include("ZoneWriting") then
+		ZoneCommon:include()
+		includedirs {
+			path.join(ProjectFolder(), "ZoneWriting")
+		}
+	end
 end
 
 function ZoneWriting:link()
-    Crypto:link()
-    Utils:link()
-    ZoneCommon:link()
-	zlib:link()
-	links {
-		"ZoneWriting"
-	}
+	if References:link("ZoneWriting") then
+		Crypto:link()
+		Utils:link()
+		ZoneCommon:link()
+		zlib:link()
+		links {
+			"ZoneWriting"
+		}
+	end
 end
 
 function ZoneWriting:use()
@@ -22,6 +26,7 @@ function ZoneWriting:use()
 end
 
 function ZoneWriting:project()
+	References:reset()
 	local folder = ProjectFolder();
 
 	project "ZoneWriting"

test/ZoneCodeGeneratorTests.lua

@@ -5,7 +5,9 @@ function ZoneCodeGeneratorTests:include()
 end
 
 function ZoneCodeGeneratorTests:link()
-    links "ZoneCommonTests"
+	if References:link("ZoneCodeGeneratorTests") then
+		links "ZoneCodeGeneratorTests"
+	end
 end
 
 function ZoneCodeGeneratorTests:use()
@@ -13,6 +15,7 @@ function ZoneCodeGeneratorTests:use()
 end
 
 function ZoneCodeGeneratorTests:project()
+	References:reset()
 	local folder = TestFolder();
 
 	project "ZoneCodeGeneratorTests"

test/ZoneCommonTests.lua

@@ -5,7 +5,9 @@ function ZoneCommonTests:include()
 end
 
 function ZoneCommonTests:link()
-    links "ZoneCommonTests"
+	if References:link("ZoneCommonTests") then
+		links "ZoneCommonTests"
+	end
 end
 
 function ZoneCommonTests:use()
@@ -13,6 +15,7 @@ function ZoneCommonTests:use()
 end
 
 function ZoneCommonTests:project()
+	References:reset()
 	local folder = TestFolder();
 
 	project "ZoneCommonTests"

thirdparty/libtomcrypt.lua

@@ -1,17 +1,21 @@
 libtomcrypt = {}
 
 function libtomcrypt:include()
-	defines{
-		"LTM_DESC"
-	}
+	if References:include("libtomcrypt") then
+		defines{
+			"LTM_DESC"
+		}
 
-	includedirs {
-		path.join(ThirdPartyFolder(), "libtomcrypt/src/headers")
-	}
+		includedirs {
+			path.join(ThirdPartyFolder(), "libtomcrypt/src/headers")
+		}
+	end
 end
 
 function libtomcrypt:link()
-	links "libtomcrypt"
+	if References:link("libtomcrypt") then
+		links "libtomcrypt"
+	end
 end
 
 function libtomcrypt:use()
@@ -19,6 +23,7 @@ function libtomcrypt:use()
 end
 
 function libtomcrypt:project()
+	References:reset()
 	local folder = ThirdPartyFolder();
 
 	project "libtomcrypt"

thirdparty/libtommath.lua

@@ -1,13 +1,17 @@
 libtommath = {}
 
 function libtommath:include()
-	includedirs {
-		path.join(ThirdPartyFolder(), "libtommath")
-	}
+	if References:include("libtommath") then
+		includedirs {
+			path.join(ThirdPartyFolder(), "libtommath")
+		}
+	end
 end
 
 function libtommath:link()
-	links "libtommath"
+	if References:link("libtommath") then
+		links "libtommath"
+	end
 end
 
 function libtommath:use()
@@ -15,6 +19,7 @@ function libtommath:use()
 end
 
 function libtommath:project()
+	References:reset()
 	local folder = ThirdPartyFolder();
 
 	project "libtommath"

thirdparty/minilzo.lua

@@ -1,13 +1,17 @@
 minilzo = {}
 
 function minilzo:include()
-	includedirs {
-		path.join(ThirdPartyFolder(), "minilzo")
-	}
+	if References:include("minilzo") then
+		includedirs {
+			path.join(ThirdPartyFolder(), "minilzo")
+		}
+	end
 end
 
 function minilzo:link()
-	links "minilzo"
+	if References:link("minilzo") then
+		links "minilzo"
+	end
 end
 
 function minilzo:use()
@@ -15,6 +19,7 @@ function minilzo:use()
 end
 
 function minilzo:project()
+	References:reset()
 	local folder = ThirdPartyFolder();
 
 	project "minilzo"

thirdparty/minizip.lua

@@ -1,15 +1,19 @@
 minizip = {}
 
 function minizip:include()
-    zlib:include()
-	includedirs {
-		path.join(ThirdPartyFolder(), "zlib/contrib/minizip")
-	}
+	if References:include("minizip") then
+		zlib:include()
+		includedirs {
+			path.join(ThirdPartyFolder(), "zlib/contrib/minizip")
+		}
+	end
 end
 
 function minizip:link()
-    zlib:link()
-	links "minizip"
+	if References:link("minizip") then
+		zlib:link()
+		links "minizip"
+	end
 end
 
 function minizip:use()
@@ -17,6 +21,7 @@ function minizip:use()
 end
 
 function minizip:project()
+	References:reset()
 	local folder = ThirdPartyFolder();
 
 	project "minizip"

thirdparty/salsa20.lua

@@ -1,13 +1,17 @@
 salsa20 = {}
 
 function salsa20:include()
-	includedirs {
-		path.join(ThirdPartyFolder(), "salsa20")
-	}
+	if References:include("salsa20") then
+		includedirs {
+			path.join(ThirdPartyFolder(), "salsa20")
+		}
+	end
 end
 
 function salsa20:link()
-	links "salsa20"
+	if References:link("salsa20") then
+		links "salsa20"
+	end
 end
 
 function salsa20:use()
@@ -15,6 +19,7 @@ function salsa20:use()
 end
 
 function salsa20:project()
+	References:reset()
 	local folder = ThirdPartyFolder();
 
 	project "salsa20"

thirdparty/zlib.lua

@@ -1,18 +1,21 @@
 zlib = {}
 
 function zlib:include()
+	if References:include("zlib") then
+		defines {
+			"ZLIB_CONST"
+		}
 
-	defines {
-		"ZLIB_CONST"
-	}
-
-	includedirs {
-		path.join(ThirdPartyFolder(), "zlib")
-	}
+		includedirs {
+			path.join(ThirdPartyFolder(), "zlib")
+		}
+	end
 end
 
 function zlib:link()
-	links "zlib"
+	if References:link("zlib") then
+		links "zlib"
+	end
 end
 
 function zlib:use()
@@ -20,6 +23,7 @@ function zlib:use()
 end
 
 function zlib:project()
+	References:reset()
 	local folder = ThirdPartyFolder();
 
 	project "zlib"