Update version to v0.21.21

Author: Atraxus

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.25.2 FATAL_ERROR)
 
 # ---- Project ----
-project(RAYX VERSION 0.21.20)
+project(RAYX VERSION 0.21.21)
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CUDA_STANDARD 20)
@@ -31,32 +31,23 @@ set(INSTALL_GTEST OFF CACHE BOOL "Disable installation of GoogleTest" FORCE)
 set(INSTALL_GMOCK OFF CACHE BOOL "Disable installation of GoogleMock" FORCE)
 
 if(APPLE)
-    set(CMAKE_INSTALL_PREFIX "/Applications/${PROJECT_NAME}/")
+    set(CMAKE_INSTALL_PREFIX "/Applications/${PROJECT_NAME}")
     set(CPACK_PACKAGE_INSTALL_DIRECTORY "/Applications/${PROJECT_NAME}")
     # macOS destinations
-    set(INSTALL_ASSETS_DIR "/Library/Application Support/${PROJECT_NAME}/Assets")
-    set(INSTALL_DATA_DIR "/Library/Application Support/${PROJECT_NAME}/Data")
-    set(INSTALL_SCRIPTS_DIR "/Library/Application Support/${PROJECT_NAME}/Scripts")
-    set(INSTALL_SHADER_DIR "/Library/Application Support/${PROJECT_NAME}/Shaders")
+    set(INSTALL_DATA_DIR "/Library/Application Support/${PROJECT_NAME}")
     set(INSTALL_FONTS_DIR "/Library/Fonts/${PROJECT_NAME}")
 elseif(UNIX AND NOT APPLE)
-    set(CMAKE_INSTALL_PREFIX "/usr/local/")
+    set(CMAKE_INSTALL_PREFIX "/usr/local")
     set(CPACK_PACKAGE_INSTALL_DIRECTORY "/usr/local")
     # Linux destinations
-    set(INSTALL_ASSETS_DIR "/usr/local/share/${PROJECT_NAME}/Assets")
-    set(INSTALL_DATA_DIR "/usr/local/share/${PROJECT_NAME}/Data")
-    set(INSTALL_SCRIPTS_DIR "/usr/local/share/${PROJECT_NAME}/Scripts")
-    set(INSTALL_SHADER_DIR "/usr/local/share/${PROJECT_NAME}/Shaders")
+    set(INSTALL_DATA_DIR "/usr/local/share/${PROJECT_NAME}")
     set(INSTALL_FONTS_DIR "/usr/local/share/fonts/${PROJECT_NAME}")
 elseif(WIN32)
-    set(CMAKE_INSTALL_PREFIX "")
-    set(CPACK_PACKAGE_INSTALL_DIRECTORY "C:/Program Files/${PROJECT_NAME}")
+    set(CMAKE_INSTALL_PREFIX "${PROJECT_NAME}")
+    set(CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}")
     # Windows destinations (inside ProgramData or another appropriate directory)
-    set(INSTALL_ASSETS_DIR "C:/ProgramData/${PROJECT_NAME}/Assets")
-    set(INSTALL_DATA_DIR "C:/ProgramData/${PROJECT_NAME}/Data")
-    set(INSTALL_SCRIPTS_DIR "C:/ProgramData/${PROJECT_NAME}/Scripts")
-    set(INSTALL_SHADER_DIR "C:/ProgramData/${PROJECT_NAME}/Shaders")
-    set(INSTALL_FONTS_DIR "C:/Windows/Fonts/${PROJECT_NAME}")
+    set(INSTALL_DATA_DIR "ProgramData/${PROJECT_NAME}")
+    set(INSTALL_FONTS_DIR "Windows/Fonts/${PROJECT_NAME}")
 endif()
 # ------------------
 

Intern/rayx-core/CMakeLists.txt

@@ -209,14 +209,16 @@ add_custom_command(
 
 # ---- CPack ----
 install(TARGETS ${PROJECT_NAME} 
-    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}bin
-    LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}lib
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}lib
+    RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+    LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
 )
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/Data
-        DESTINATION ${INSTALL_DATA_DIR})
+        DESTINATION ${INSTALL_DATA_DIR}
+        FILES_MATCHING PATTERN "*")
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/Scripts
-        DESTINATION ${INSTALL_SCRIPTS_DIR})
+        DESTINATION ${INSTALL_DATA_DIR}
+        FILES_MATCHING PATTERN "*")
 include(InstallRequiredSystemLibraries)
 include(CPack)
 # -----------------

Intern/rayx-ui/CMakeLists.txt

@@ -56,23 +56,24 @@ if(Vulkan_FOUND)
 
 
     # ---- CPack ----
-    install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}bin)
+    install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
     if(CMAKE_BUILD_TYPE STREQUAL "Debug")
         install(DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG}/Shaders
-                DESTINATION ${INSTALL_SHADER_DIR}
+                DESTINATION ${INSTALL_DATA_DIR}
                 FILES_MATCHING PATTERN "*_*.spv")
         install(DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG}/Assets
-                DESTINATION ${INSTALL_ASSETS_DIR}
+                DESTINATION ${INSTALL_DATA_DIR}
                 PATTERN "fonts" EXCLUDE)
         install(DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG}/Assets/fonts
-                DESTINATION ${INSTALL_FONTS_DIR})
+                DESTINATION ${INSTALL_FONTS_DIR}
+                FILES_MATCHING PATTERN "*")
     else()
         install(DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}/Shaders
-                DESTINATION ${INSTALL_SHADER_DIR}
+                DESTINATION ${INSTALL_DATA_DIR}
                 FILES_MATCHING PATTERN "*_*.spv")
         install(DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}/Assets
-                DESTINATION ${INSTALL_ASSETS_DIR}
+                DESTINATION ${INSTALL_DATA_DIR}
                 PATTERN "fonts" EXCLUDE)
         install(DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}/Assets/fonts
                 DESTINATION ${INSTALL_FONTS_DIR})

Intern/rayx/CMakeLists.txt

@@ -42,7 +42,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_BINARY_DIR})
 # ----------------------
 
 # ---- CPack ----
-install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}bin)
+install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 include(InstallRequiredSystemLibraries)
 include(CPack)
 # --------------