File tree Expand file tree Collapse file tree 4 files changed +22
-10
lines changed Expand file tree Collapse file tree 4 files changed +22
-10
lines changed Original file line number Diff line number Diff line change 11# Changes
22
3- - Fixing shader distribution with binaries
4- - Fixing material data distribution with binaries
5- - Documentaion improvements
3+ - Fixing shader distribution with binaries again
Original file line number Diff line number Diff line change 11cmake_minimum_required (VERSION 3.15 FATAL_ERROR)
22
33# ---- Project ----
4- project (RAYX VERSION 0.19.2 )
4+ project (RAYX VERSION 0.19.3 )
55set (CMAKE_CXX_STANDARD 20)
66set (CMAKE_CXX_STANDARD_REQUIRED ON )
77# -----------------
Original file line number Diff line number Diff line change @@ -37,9 +37,16 @@ if(Vulkan_FOUND)
3737
3838 # ---- CPack ----
3939 install (TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
40- install (DIRECTORY ${CMAKE_BINARY_DIR} /bin/Shaders
41- DESTINATION ./bin
42- FILES_MATCHING PATTERN "*_*.spv" )
40+
41+ if (CMAKE_BUILD_TYPE STREQUAL "Debug" )
42+ install (DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG} /Shaders
43+ DESTINATION ./bin
44+ FILES_MATCHING PATTERN "*_*.spv" )
45+ else ()
46+ install (DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE} /Shaders
47+ DESTINATION ./bin
48+ FILES_MATCHING PATTERN "*_*.spv" )
49+ endif ()
4350 include (InstallRequiredSystemLibraries)
4451 set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR} /LICENSE" )
4552 set (CPACK_PACKAGE_VERSION ${PROJECT_VERSION} )
Original file line number Diff line number Diff line change @@ -41,9 +41,16 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_BINARY_DIR})
4141# ----------------------
4242
4343# ---- CPack ----
44- install (DIRECTORY ${CMAKE_BINARY_DIR} /bin/Shaders
45- DESTINATION ./bin
46- FILES_MATCHING PATTERN "comp.spv" )
44+ if (CMAKE_BUILD_TYPE STREQUAL "Debug" )
45+ install (DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG} /Shaders
46+ DESTINATION ./bin
47+ FILES_MATCHING PATTERN "comp.spv" )
48+ else ()
49+ install (DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE} /Shaders
50+ DESTINATION ./bin
51+ FILES_MATCHING PATTERN "comp.spv" )
52+ endif ()
53+
4754install (DIRECTORY ${CMAKE_SOURCE_DIR} /Data
4855 DESTINATION ./bin)
4956set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "rayx - A RAYX Beamline Simulation Tool" )
You can’t perform that action at this time.
0 commit comments