rework dependency handling

Author: MathewBensonCode

CMakeLists.txt

@@ -46,30 +46,6 @@ endif()
 # Externals dependencies
 #
 if (NOT LAUNCHER_ONLY)
-	add_subdirectory (${EXTERNAL_DIR}/fmt)
-	add_subdirectory (${EXTERNAL_DIR}/imgui)
-	add_subdirectory (${EXTERNAL_DIR}/glfw)
-	add_subdirectory (${EXTERNAL_DIR}/spdlog)
-	add_subdirectory (${EXTERNAL_DIR}/glm)
-	add_subdirectory (${EXTERNAL_DIR}/entt)
-	add_subdirectory (${EXTERNAL_DIR}/assimp)
-	add_subdirectory (${EXTERNAL_DIR}/stduuid)
-	add_subdirectory (${EXTERNAL_DIR}/yaml-cpp)
-	add_subdirectory (${EXTERNAL_DIR}/SPIRV-headers)
-	add_subdirectory (${EXTERNAL_DIR}/SPIRV-Tools)
-	add_subdirectory (${EXTERNAL_DIR}/glslang)
-	add_subdirectory (${EXTERNAL_DIR}/SPIRV-Cross)
-	add_subdirectory (${EXTERNAL_DIR}/gtest)
-	add_subdirectory (${EXTERNAL_DIR}/VulkanMemoryAllocator)
-	add_subdirectory (${EXTERNAL_DIR}/tlsf)
-	add_subdirectory (${EXTERNAL_DIR}/rapidhash)
-	add_subdirectory (${EXTERNAL_DIR}/CLI11)
-
-	set (CMAKE_PREFIX_PATH
-		${CMAKE_PREFIX_PATH}
-		${EXTERNAL_DIR}/Vulkan-Headers/build/install/share/cmake
-	)
-	add_subdirectory (${EXTERNAL_DIR}/Vulkan-Loader)
 
     ## Setup Dependencies
 

Scripts/BuildEngine.ps1

@@ -113,7 +113,6 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
     # Check the system name
     if ($IsLinux) {
         $systemName = "Linux"
-        $cMakeGenerator
     }
     elseif ($IsMacOS) {
         $systemName = "Darwin"
@@ -171,11 +170,11 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
             $cMakeCacheVariableOverride += ' -DCMAKE_CONFIGURATION_TYPES=Debug;Release '
         }
         "Linux" {
-            $cMakeGenerator = "-G `"Unix Makefiles`""
+            $cMakeGenerator = "-G Ninja"
 
             # Set Linux build compiler
-            $env:CC = '/usr/bin/gcc-11'
-            $env:CXX = '/usr/bin/g++-11'
+            $env:CC = 'gcc'
+            $env:CXX = 'g++'
         }
         "Darwin" {
             $cMakeGenerator = "-G `"Xcode`""

Scripts/Shared.ps1

@@ -214,6 +214,9 @@ function Find-ClangFormat () {
 }
 
 function Setup-ShaderCCompilerTool () {
+    if($IsLinux) {
+        return
+    }
     $repoConfiguration = Get-RepositoryConfiguration
     $repositoryToolPath = $repoConfiguration.Paths.Tools
 

__externals/externals.cmake

@@ -1,24 +1,29 @@
 # Packages
 #
-set(EXTERNAL_INCLUDE_DIRS
-	${EXTERNAL_DIR}/Vulkan-Headers/build/install/include
-	${EXTERNAL_DIR}/fmt/include
-	${EXTERNAL_DIR}/glm/glm
-	${EXTERNAL_DIR}/imgui/src
-	${EXTERNAL_DIR}/tlsf/src
-	${EXTERNAL_DIR}/rapidhash/src
-	${EXTERNAL_DIR}/spdlog/include
-	${EXTERNAL_DIR}/glfw/include
-	${EXTERNAL_DIR}/entt
-	${EXTERNAL_DIR}/assimp/include
-	${EXTERNAL_DIR}/stduuid/include
-	${EXTERNAL_DIR}/yaml-cpp/include
-	${EXTERNAL_DIR}/SPIRV-headers
-	${EXTERNAL_DIR}/SPIRV-Tools
-	${EXTERNAL_DIR}/glslang
-	${EXTERNAL_DIR}/SPIRV-Cross
-	${EXTERNAL_DIR}/VulkanMemoryAllocator
-)
+	add_subdirectory (${EXTERNAL_DIR}/fmt)
+	add_subdirectory (${EXTERNAL_DIR}/imgui)
+	add_subdirectory (${EXTERNAL_DIR}/glfw)
+	add_subdirectory (${EXTERNAL_DIR}/spdlog)
+	add_subdirectory (${EXTERNAL_DIR}/glm)
+	add_subdirectory (${EXTERNAL_DIR}/entt)
+	add_subdirectory (${EXTERNAL_DIR}/assimp)
+	add_subdirectory (${EXTERNAL_DIR}/stduuid)
+	add_subdirectory (${EXTERNAL_DIR}/yaml-cpp)
+	add_subdirectory (${EXTERNAL_DIR}/SPIRV-headers)
+	add_subdirectory (${EXTERNAL_DIR}/SPIRV-Tools)
+	add_subdirectory (${EXTERNAL_DIR}/glslang)
+	add_subdirectory (${EXTERNAL_DIR}/SPIRV-Cross)
+	add_subdirectory (${EXTERNAL_DIR}/gtest)
+	add_subdirectory (${EXTERNAL_DIR}/VulkanMemoryAllocator)
+	add_subdirectory (${EXTERNAL_DIR}/tlsf)
+	add_subdirectory (${EXTERNAL_DIR}/rapidhash)
+	add_subdirectory (${EXTERNAL_DIR}/CLI11)
+
+	set (CMAKE_PREFIX_PATH
+		${CMAKE_PREFIX_PATH}
+		${EXTERNAL_DIR}/Vulkan-Headers/build/install/share/cmake
+	)
+	add_subdirectory (${EXTERNAL_DIR}/Vulkan-Loader)
 
 if (MSVC)
 	target_compile_options(assimp PRIVATE /Wv:18) # Fix zip lib compile issue
@@ -30,43 +35,17 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
 	target_link_libraries(imgui PUBLIC ${CMAKE_DL_LIBS})
 endif()
 
-add_library (imported::External_libs INTERFACE IMPORTED)
-add_library(imported::External_editorLibs INTERFACE IMPORTED)
-
-target_include_directories(imported::External_lib INTERFACE 
-	${EXTERNAL_DIR}/Vulkan-Headers/build/install/include
-	${EXTERNAL_DIR}/fmt/include
-	${EXTERNAL_DIR}/glm/glm
-	${EXTERNAL_DIR}/imgui/src
-	${EXTERNAL_DIR}/tlsf/src
-	${EXTERNAL_DIR}/rapidhash/src
-	${EXTERNAL_DIR}/spdlog/include
-	${EXTERNAL_DIR}/glfw/include
-	${EXTERNAL_DIR}/entt
-	${EXTERNAL_DIR}/assimp/include
-	${EXTERNAL_DIR}/stduuid/include
-	${EXTERNAL_DIR}/yaml-cpp/include
-	${EXTERNAL_DIR}/SPIRV-headers
-	${EXTERNAL_DIR}/SPIRV-Tools
-	${EXTERNAL_DIR}/glslang
-	${EXTERNAL_DIR}/SPIRV-Cross
-	${EXTERNAL_DIR}/VulkanMemoryAllocator
-)
-
-target_include_directories(imported::External_editorLibs INTERFACE
-	${EXTERNAL_DIR}/nlohmann_json/single_include
-	${EXTERNAL_DIR}/CLI11/include
-)
-
+add_library (ZEngineLibs INTERFACE)
+add_library(TetragramaLibs INTERFACE)
 
-target_link_libraries(imported::External_editorLibs INTERFACE
+target_link_libraries(TetragramaLibs INTERFACE
 	CLI11::CLI11
 )
 
-target_link_libraries(imported::External_libs INTERFACE
+target_link_libraries(ZEngineLibs INTERFACE
 	vulkan
-	fmt
-	glm
+	fmt::fmt
+	glm::glm
 	imgui
 	spdlog
 	glfw
@@ -81,3 +60,6 @@ target_link_libraries(imported::External_libs INTERFACE
 	tlsf
 	rapidhash
 )
+
+add_library(imported::External_libs ALIAS ZEngineLibs)
+add_library(imported::External_editorLibs ALIAS TetragramaLibs)

dependencies.cmake

@@ -17,4 +17,4 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
     target_include_directories(imported::cppwinrt_headers INTERFACE
         ${CMAKE_BINARY_DIR}/__winrt
     )
-endif()
+endif()