Panzerfaust install and upgrade vulkan

Author: MathewBenson

.github/workflows/job-cmakebuild-linux.yml

@@ -47,5 +47,7 @@ jobs:
         if-no-files-found: error
         path: |
           Result.Linux.x64.${{inputs.configuration}}/bin
-          Result.Linux.x64.${{inputs.configuration}}/lib
+          Result.Linux.x64.${{inputs.configuration}}/lib/libbulkand.so
+          Result.Linux.x64.${{inputs.configuration}}/lib/libbulkand.so.1
+          Result.Linux.x64.${{inputs.configuration}}/lib/libbulkand.so.1.3.296
           Result.Linux.x64.${{inputs.configuration}}/ZEngine/tests

Obelisk/CMakeLists.txt

@@ -9,9 +9,6 @@ project (Obelisk
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 set	(CMAKE_CXX_STANDARD 20)
 
-
-
-
 set (TARGET_NAME Obelisk)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
@@ -51,6 +48,12 @@ target_link_libraries(${TARGET_NAME} PUBLIC
 )
 
 install(TARGETS ${TARGET_NAME} 
-    DESTINATION bin/Editor
+    RUNTIME DESTINATION bin/Editor
 )
 
+install(DIRECTORY ../Resources/Editor DESTINATION bin)
+
+install(DIRECTORY ../Resources/Shaders DESTINATION bin/Editor)
+
+
+

Panzerfaust/CMakeLists.txt

@@ -23,11 +23,13 @@ if ((APPLE) OR (${CMAKE_SYSTEM_NAME} STREQUAL "Windows"))
     endif ()
 endif()
 
-set (BUILD_CONFIGURATION -c $<IF:$<CONFIG:Debug>,Debug,Release>)
+set (BUILD_CONFIGURATION $<IF:$<CONFIG:Debug>,Debug,Release>)
 if (APPLE)
-    set (RUNTIME_IDENTIFIER -r $<IF:$<BOOL:${MACOSX_ARCHITECTURE_ARM64}>,osx-arm64,osx-x64>)
+    set (RUNTIME_IDENTIFIER $<IF:$<BOOL:${MACOSX_ARCHITECTURE_ARM64}>,osx-arm64,osx-x64>)
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-    set (RUNTIME_IDENTIFIER -r win-x64)
+    set (RUNTIME_IDENTIFIER win-x64)
+elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+    set (RUNTIME_IDENTIFIER linux-x64)
 endif ()
 
 set (CUSTOM_TARGET_NAME ${CSPROJ})
@@ -38,7 +40,9 @@ add_custom_target (${CUSTOM_TARGET_NAME} ALL)
 
 add_custom_command (TARGET ${CUSTOM_TARGET_NAME} POST_BUILD
     COMMENT "Building and Publishing Panzerfaust"
-    COMMAND dotnet build ${CSPROJ_SOURCE_FILE} ${RUNTIME_IDENTIFIER} ${BUILD_CONFIGURATION} -v n
-    COMMAND dotnet publish ${CSPROJ_SOURCE_FILE} ${RUNTIME_IDENTIFIER} ${BUILD_CONFIGURATION} -o ../bin/
+    COMMAND dotnet build ${CSPROJ_SOURCE_FILE} -r ${RUNTIME_IDENTIFIER} -c ${BUILD_CONFIGURATION} -v n
+    COMMAND dotnet publish ${CSPROJ_SOURCE_FILE} -r ${RUNTIME_IDENTIFIER} -c ${BUILD_CONFIGURATION} -o bin
     VERBATIM
 )
+
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin DESTINATION ${CMAKE_INSTALL_PREFIX})

Tetragrama/CMakeLists.txt

@@ -54,4 +54,3 @@ target_compile_definitions(${TARGET_NAME}
 
 target_link_libraries(${TARGET_NAME} PUBLIC zEngineLib)
 
-#install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME}Targets)

ZEngine/ZEngine/CMakeLists.txt

@@ -76,5 +76,3 @@ endif()
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     target_link_libraries(zEngineLib PUBLIC stdc++fs)
 endif ()
-
-#install(TARGETS zEngineLib EXPORT zEngineTargets)

dependencies.cmake

@@ -74,7 +74,7 @@ FetchContent_Declare(
 FetchContent_Declare(
   spirv_cross_core
   GIT_REPOSITORY https://github.com/KhronosGroup/SPIRV-Cross.git
-  GIT_TAG vulkan-sdk-1.3.290.0
+  GIT_TAG vulkan-sdk-1.3.296.0
   GIT_SHALLOW TRUE
   )
 
@@ -89,7 +89,7 @@ FetchContent_Declare(
     SPIRV-Headers
     GIT_REPOSITORY https://github.com/KhronosGroup/SPIRV-Headers.git
     GIT_SHALLOW TRUE
-    GIT_TAG vulkan-sdk-1.3.290.0
+    GIT_TAG vulkan-sdk-1.3.296.0
 )
 
 FetchContent_Declare(
@@ -106,7 +106,7 @@ FetchContent_Declare(
     SPIRV-Tools
     GIT_REPOSITORY https://github.com/KhronosGroup/SPIRV-Tools.git
     GIT_SHALLOW TRUE
-    GIT_TAG vulkan-sdk-1.3.290.0
+    GIT_TAG vulkan-sdk-1.3.296.0
 )
 
 
@@ -153,13 +153,13 @@ Fetchcontent_Declare(
 FetchContent_Declare(Vulkan-Headers
     GIT_REPOSITORY https://github.com/KhronosGroup/Vulkan-Headers
     GIT_SHALLOW TRUE
-    GIT_TAG vulkan-sdk-1.3.290.0
+    GIT_TAG vulkan-sdk-1.3.296.0
 )
 
 FetchContent_Declare(Vulkan-Loader
     GIT_REPOSITORY https://github.com/KhronosGroup/Vulkan-Loader
     GIT_SHALLOW TRUE
-    GIT_TAG vulkan-sdk-1.3.290.0
+    GIT_TAG vulkan-sdk-1.3.296.0
 )