Skip to content

Commit 85c0989

Browse files
committed
Update version to v0.21.38
1 parent 45c54be commit 85c0989

File tree

4 files changed

+27
-4
lines changed

4 files changed

+27
-4
lines changed

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.25.2 FATAL_ERROR)
22

33
# ---- Project ----
4-
project(RAYX VERSION 0.21.37)
4+
project(RAYX VERSION 0.21.38)
55
set(CMAKE_CXX_STANDARD 23)
66
set(CMAKE_CXX_STANDARD_REQUIRED ON)
77
set(CMAKE_CUDA_STANDARD 20)
@@ -38,8 +38,8 @@ elseif(UNIX AND NOT APPLE)
3838
set(INSTALL_DATA_DIR "share/${PROJECT_NAME}")
3939
set(INSTALL_FONTS_DIR "share/fonts/${PROJECT_NAME}")
4040
elseif(WIN32)
41-
set(INSTALL_DATA_DIR "Data")
42-
set(INSTALL_FONTS_DIR "Fonts")
41+
set(INSTALL_DATA_DIR ".")
42+
set(INSTALL_FONTS_DIR ".")
4343
endif()
4444
# ------------------
4545

Intern/rayx-core/CMakeLists.txt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,20 @@ add_custom_command(
212212
# -----------------
213213

214214
# ---- CPack ----
215+
if(APPLE OR UNIX)
216+
install(TARGETS ${PROJECT_NAME}
217+
LIBRARY DESTINATION lib
218+
ARCHIVE DESTINATION lib
219+
)
220+
elseif(WIN32)
221+
install(TARGETS ${PROJECT_NAME}
222+
LIBRARY DESTINATION .
223+
ARCHIVE DESTINATION .
224+
)
225+
endif()
215226
install(DIRECTORY ${CMAKE_SOURCE_DIR}/Data/nff
216227
DESTINATION ${INSTALL_DATA_DIR})
217-
install(DIRECTORY ${CMAKE_SOURCE_DIR}/Data/Palik
228+
install(DIRECTORY ${CMAKE_SOURCE_DIR}/Data/PALIK
218229
DESTINATION ${INSTALL_DATA_DIR})
219230
install(DIRECTORY ${CMAKE_SOURCE_DIR}/Scripts
220231
DESTINATION ${INSTALL_DATA_DIR})

Intern/rayx-ui/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@ if(Vulkan_FOUND)
5656

5757

5858
# ---- CPack ----
59+
if(APPLE OR UNIX)
60+
install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
61+
elseif(WIN32)
62+
install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION .)
63+
endif()
64+
5965
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
6066
install(DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG}/Shaders
6167
DESTINATION ${INSTALL_DATA_DIR})

Intern/rayx/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_BINARY_DIR})
4242
# ----------------------
4343

4444
# ---- CPack ----
45+
if(APPLE OR UNIX)
46+
install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
47+
elseif(WIN32)
48+
install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION .)
49+
endif()
50+
4551
include(InstallRequiredSystemLibraries)
4652
include(CPack)
4753
# --------------

0 commit comments

Comments
 (0)