Skip to content

Commit f23f32f

Browse files
author
devsh
committed
Merge branch 'master' of github.com:Devsh-Graphics-Programming/Nabla
2 parents fb9d777 + ff527f9 commit f23f32f

File tree

3 files changed

+43
-4
lines changed

3 files changed

+43
-4
lines changed

CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,10 @@ endif()
4848

4949
find_package(Vulkan)
5050
if (Vulkan_FOUND)
51-
message(STATUS "Building with Vulkan driver")
51+
message(STATUS "Found Vulkan SDK")
52+
cmake_path(GET Vulkan_INCLUDE_DIR PARENT_PATH VULKAN_SDK)
5253
else()
53-
message(STATUS "Vulkan driver is not enabled")
54+
message(STATUS "Vulkan SDK is not found")
5455
endif()
5556

5657
option(NBL_COMPILE_WITH_CUDA "Compile with CUDA interop?" OFF)
@@ -280,5 +281,5 @@ add_subdirectory(artifacts)
280281

281282
option(NBL_CPACK_INCLUDE_EXAMPLES "CPack with examples and media" ON)
282283
include(cpack/package)
283-
284+
include(build/info)
284285
export(TARGETS ${_NBL_3RDPARTY_TARGETS_} Nabla NAMESPACE Nabla:: APPEND FILE ${NBL_ROOT_PATH_BINARY}/NablaExport.cmake)

cmake/build/info.cmake

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
include_guard(GLOBAL)
2+
3+
if (NOT DEFINED NBL_ROOT_PATH_BINARY)
4+
message(FATAL_ERROR "NBL_ROOT_PATH_BINARY is not defined or it's empty")
5+
endif()
6+
7+
if(NOT TARGET gtml)
8+
message(FATAL_ERROR "gtml target not defined!")
9+
endif()
10+
11+
set(OUTPUT_DIR "${NBL_ROOT_PATH_BINARY}")
12+
13+
if(Vulkan_FOUND)
14+
set(VKSDK_INFO_CMD "${VULKAN_SDK}/bin/vulkaninfoSDK" -j -o "${OUTPUT_DIR}/vulkan-info.json")
15+
else()
16+
set(VKSDK_INFO_CMD "${CMAKE_COMMAND}" -E touch "${OUTPUT_DIR}/vulkan-info.json")
17+
endif()
18+
19+
execute_process(COMMAND ${VKSDK_INFO_CMD})
20+
execute_process(COMMAND "${CMAKE_COMMAND}" -E capabilities OUTPUT_VARIABLE PIPE)
21+
file(WRITE "${OUTPUT_DIR}/cmake-caps.json" "${PIPE}")
22+
23+
get_target_property(GTML_SOURCES gtml SOURCES)
24+
list(FILTER GTML_SOURCES INCLUDE REGEX "git_info\\.cpp$")
25+
26+
set(BUILD_INFO_DEPENDENCIES
27+
"${OUTPUT_DIR}/vulkan-info.json"
28+
"${OUTPUT_DIR}/cmake-caps.json"
29+
CMakeCache.txt
30+
CMakeFiles/CMakeConfigureLog.yaml
31+
${GTML_SOURCES}
32+
)
33+
34+
add_custom_target(nbl_build_info
35+
DEPENDS ${BUILD_INFO_DEPENDENCIES} gtml
36+
COMMAND "${CMAKE_COMMAND}" -E tar c build_info.zip --format=zip ${BUILD_INFO_DEPENDENCIES}
37+
COMMENT "Generating \"${NBL_ROOT_PATH_BINARY}/build_info.zip\", attach this within your issue"
38+
)

0 commit comments

Comments
 (0)