Update version to v0.19.3

hz-b · Mar 2, 2024 · 491a3c9 · 491a3c9
1 parent a0992a2
commit 491a3c9
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,3 @@
 # Changes
 
-- Fixing shader distribution with binaries
-- Fixing material data distribution with binaries
-- Documentaion improvements
+- Fixing shader distribution with binaries again
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
 
 # ---- Project ----
-project(RAYX VERSION 0.19.2)
+project(RAYX VERSION 0.19.3)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 # -----------------

diff --git a/Intern/rayx-ui/CMakeLists.txt b/Intern/rayx-ui/CMakeLists.txt
@@ -37,9 +37,16 @@ if(Vulkan_FOUND)
 
     # ---- CPack ----
     install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
-    install(DIRECTORY ${CMAKE_BINARY_DIR}/bin/Shaders
-            DESTINATION ./bin
-            FILES_MATCHING PATTERN "*_*.spv")
+
+    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+        install(DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG}/Shaders
+                DESTINATION ./bin
+                FILES_MATCHING PATTERN "*_*.spv")
+    else()
+        install(DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}/Shaders
+                DESTINATION ./bin
+                FILES_MATCHING PATTERN "*_*.spv")
+    endif()
     include(InstallRequiredSystemLibraries)
     set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
     set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})

diff --git a/Intern/rayx/CMakeLists.txt b/Intern/rayx/CMakeLists.txt
@@ -41,9 +41,16 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_BINARY_DIR})
 # ----------------------
 
 # ---- CPack ----
-install(DIRECTORY ${CMAKE_BINARY_DIR}/bin/Shaders
-        DESTINATION ./bin
-        FILES_MATCHING PATTERN "comp.spv")
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+  install(DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG}/Shaders
+          DESTINATION ./bin
+          FILES_MATCHING PATTERN "comp.spv")
+else()
+  install(DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}/Shaders
+          DESTINATION ./bin
+          FILES_MATCHING PATTERN "comp.spv")
+endif()
+
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/Data
         DESTINATION ./bin)
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "rayx - A RAYX Beamline Simulation Tool")