Merge pull request #298 from euclid-skyline/build_workflow_branch_from_109a4f4

Visual Studio/Ninja Multi-Config Build workflow branch from 109a4f4

Author: gpx1000

.gitignore

@@ -11,7 +11,10 @@ ebook/*.epub
 
 convert.py
 
+**/[B,b]uild/*
+
 attachments/build/**
+attachments/vcpkg.json
 attachments/android/.gradle/**
 attachments/android/.idea
 attachments/android/.gradle/**

attachments/CMakeLists.txt

@@ -51,12 +51,12 @@ if(ENABLE_CPP20_MODULE)
   endif()
 
   target_sources(VulkanCppModule
-          PUBLIC
-          FILE_SET cxx_modules TYPE CXX_MODULES
-          BASE_DIRS
-          "${Vulkan_INCLUDE_DIR}"
-          FILES
-          "${Vulkan_INCLUDE_DIR}/vulkan/vulkan.cppm"
+    PUBLIC
+    FILE_SET cxx_modules TYPE CXX_MODULES
+    BASE_DIRS
+    "${Vulkan_INCLUDE_DIR}"
+    FILES
+    "${Vulkan_INCLUDE_DIR}/vulkan/vulkan.cppm"
   )
 
 
@@ -85,7 +85,12 @@ find_program(SLANGC_EXECUTABLE slangc HINTS $ENV{VULKAN_SDK}/bin REQUIRED)
 
 function (add_shaders_target TARGET)
   cmake_parse_arguments ("SHADER" "" "CHAPTER_NAME" "SOURCES" ${ARGN})
-  set (SHADERS_DIR ${SHADER_CHAPTER_NAME}/shaders)
+  if(${CMAKE_GENERATOR} MATCHES "Visual Studio.*" OR 
+      ${CMAKE_GENERATOR} MATCHES "Ninja Multi-Config")
+    set (SHADERS_DIR ${CMAKE_BINARY_DIR}/${SHADER_CHAPTER_NAME}/$<CONFIG>/shaders)
+  else()
+    set (SHADERS_DIR ${CMAKE_BINARY_DIR}/${SHADER_CHAPTER_NAME}/shaders)
+  endif()
   add_custom_command (
     OUTPUT ${SHADERS_DIR}
     COMMAND ${CMAKE_COMMAND} -E make_directory ${SHADERS_DIR}
@@ -95,32 +100,37 @@ function (add_shaders_target TARGET)
     COMMAND glslang::validator
     ARGS --target-env vulkan1.0 ${SHADER_SOURCES} --quiet
     WORKING_DIRECTORY ${SHADERS_DIR}
-    DEPENDS ${SHADERS_DIR} ${SHADER_SOURCES}
-    COMMENT "Compiling Shaders"
+    DEPENDS ${SHADER_SOURCES}
+    COMMENT "Compiling Shaders for ${TARGET}"
     VERBATIM
     )
   add_custom_target (${TARGET} DEPENDS ${SHADERS_DIR}/frag.spv ${SHADERS_DIR}/vert.spv)
 endfunction ()
 
 function (add_slang_shader_target TARGET)
   cmake_parse_arguments ("SHADER" "" "CHAPTER_NAME" "SOURCES" ${ARGN})
-  set (SHADERS_DIR ${SHADER_CHAPTER_NAME}/shaders)
+  if(${CMAKE_GENERATOR} MATCHES "Visual Studio.*" OR 
+      ${CMAKE_GENERATOR} MATCHES "Ninja Multi-Config")
+    set (SHADERS_DIR ${CMAKE_BINARY_DIR}/${SHADER_CHAPTER_NAME}/$<CONFIG>/shaders)
+  else()
+    set (SHADERS_DIR ${CMAKE_BINARY_DIR}/${SHADER_CHAPTER_NAME}/shaders)
+  endif()
   file(GLOB HAS_COMPUTE ${CHAPTER_SHADER}.comp)
   set (ENTRY_POINTS -entry vertMain -entry fragMain)
   if(HAS_COMPUTE)
     list(APPEND ENTRY_POINTS -entry compMain)
   endif()
   add_custom_command (
-          OUTPUT ${SHADERS_DIR}
-          COMMAND ${CMAKE_COMMAND} -E make_directory ${SHADERS_DIR}
+    OUTPUT ${SHADERS_DIR}
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${SHADERS_DIR}
   )
   add_custom_command (
-          OUTPUT  ${SHADERS_DIR}/slang.spv
-          COMMAND ${SLANGC_EXECUTABLE} ${SHADER_SOURCES} -target spirv -profile spirv_1_4+spvRayQueryKHR -emit-spirv-directly -fvk-use-entrypoint-name ${ENTRY_POINTS} -o slang.spv
-          WORKING_DIRECTORY ${SHADERS_DIR}
-          DEPENDS ${SHADERS_DIR} ${SHADER_SOURCES}
-          COMMENT "Compiling Slang Shaders"
-          VERBATIM
+    OUTPUT  ${SHADERS_DIR}/slang.spv
+    COMMAND ${SLANGC_EXECUTABLE} ${SHADER_SOURCES} -target spirv -profile spirv_1_4+spvRayQueryKHR -emit-spirv-directly -fvk-use-entrypoint-name ${ENTRY_POINTS} -o slang.spv
+    WORKING_DIRECTORY ${SHADERS_DIR}
+    DEPENDS ${SHADER_SOURCES}
+    COMMENT "Compiling Slang Shaders for ${TARGET}"
+    VERBATIM
   )
   add_custom_target (${TARGET} DEPENDS ${SHADERS_DIR}/slang.spv)
 endfunction()
@@ -165,15 +175,45 @@ function (add_chapter CHAPTER_NAME)
     target_link_libraries (${CHAPTER_NAME} ${CHAPTER_LIBS})
   endif ()
   if (DEFINED CHAPTER_MODELS)
-    list(TRANSFORM CHAPTER_MODELS PREPEND "${CMAKE_SOURCE_DIR}/assets/")
+    list(TRANSFORM CHAPTER_MODELS PREPEND "${CMAKE_CURRENT_SOURCE_DIR}/assets/")
     file (COPY ${CHAPTER_MODELS} DESTINATION ${CMAKE_BINARY_DIR}/${CHAPTER_NAME}/models)
+    
+    if(${CMAKE_GENERATOR} MATCHES "Visual Studio.*" OR 
+      ${CMAKE_GENERATOR} MATCHES "Ninja Multi-Config")
+      sync_directory(
+        "${CMAKE_BINARY_DIR}/${CHAPTER_NAME}/models"
+        "${CMAKE_BINARY_DIR}/${CHAPTER_NAME}/$<CONFIG>/models"
+        ${CHAPTER_NAME}
+        "${CHAPTER_NAME} - Models"
+      )
+    endif()
   endif ()
   if (DEFINED CHAPTER_TEXTURES)
-    list(TRANSFORM CHAPTER_TEXTURES PREPEND "${CMAKE_SOURCE_DIR}/assets/")
+    list(TRANSFORM CHAPTER_TEXTURES PREPEND "${CMAKE_CURRENT_SOURCE_DIR}/assets/")
     file (COPY ${CHAPTER_TEXTURES} DESTINATION ${CMAKE_BINARY_DIR}/${CHAPTER_NAME}/textures)
+
+    if(${CMAKE_GENERATOR} MATCHES "Visual Studio.*" OR 
+      ${CMAKE_GENERATOR} MATCHES "Ninja Multi-Config")
+      sync_directory(
+        "${CMAKE_BINARY_DIR}/${CHAPTER_NAME}/textures"
+        "${CMAKE_BINARY_DIR}/${CHAPTER_NAME}/$<CONFIG>/textures"
+        ${CHAPTER_NAME}
+        "${CHAPTER_NAME} - Textures"
+      )  
+    endif()
   endif ()
 endfunction ()
 
+function(sync_directory SRC_DIR DST_DIR TARGET_NAME LABEL)
+  add_custom_command(
+    TARGET ${TARGET_NAME}
+    POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E make_directory "${DST_DIR}"
+    COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different "${SRC_DIR}" "${DST_DIR}"
+    COMMENT "${LABEL}: Syncing directory"
+  )
+endfunction()
+
 add_chapter (00_base_code)
 
 add_chapter (01_instance_creation)