Some build fixes

hz-b · Mar 2, 2024 · c2e8b10 · c2e8b10
1 parent a2c5e42
commit c2e8b10
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/Intern/rayx-core/CMakeLists.txt b/Intern/rayx-core/CMakeLists.txt
@@ -120,8 +120,14 @@ target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC
 # ---- Compile Shaders ----
 if(Vulkan_FOUND)
     add_dependencies(${PROJECT_NAME} RAYX_CORE_COMPILE_SHADER)
-    set(RAYX_CORE_SHADER ${CMAKE_BINARY_DIR}/bin/Shaders/comp.spv)
-    file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin/Shaders)
+    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+        set(OUTPUT_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG}/Shaders)
+    else()
+        set(OUTPUT_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}/Shaders)
+    endif()
+    set(RAYX_CORE_SHADER ${OUTPUT_DIR}/comp.spv)
+
+    file(MAKE_DIRECTORY ${OUTPUT_DIR})
     add_custom_command(
         OUTPUT
         ${RAYX_CORE_SHADER}

diff --git a/Intern/rayx-ui/CMakeLists.txt b/Intern/rayx-ui/CMakeLists.txt
@@ -71,7 +71,11 @@ if(Vulkan_FOUND)
     # ---- Compile Shaders ----
     # Function to compile shaders
     function(compile_shaders target shaders_dir)
-        set(OUTPUT_DIR "${CMAKE_BINARY_DIR}/bin/shaders")
+        if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+            set(OUTPUT_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG}/Shaders)
+        else()
+            set(OUTPUT_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}/Shaders)
+        endif()
         file(MAKE_DIRECTORY ${OUTPUT_DIR})
         # Get a list of all shader files in the specified directory
         file(GLOB SHADER_FILES "${shaders_dir}/*.frag" "${shaders_dir}/*.vert")
@@ -85,7 +89,7 @@ if(Vulkan_FOUND)
             string(SUBSTRING ${SHADER_EXT} 1 -1 SHADER_STAGE) # Remove the leading '.' from the extension
 
             # Set output file name
-            set(OUTPUT_FILE "${CMAKE_BINARY_DIR}/bin/Shaders/${SHADER_NAME}_${SHADER_STAGE}.spv")
+            set(OUTPUT_FILE ${OUTPUT_DIR}/${SHADER_NAME}_${SHADER_STAGE}.spv)
 
             # Create a custom command for each shader file
             add_custom_command(