NASP/cuda-samples
53
0
Fork 0
mirror of https://github.com/NVIDIA/cuda-samples.git synced 2026-01-09 20:07:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bug 5454390: Add specific glfw3/X11 link for vulkan samples

Browse Source
This commit is contained in:
shawnz 2025-08-15 17:30:02 +08:00
parent 6e23a98575
commit cbc075ef59
3 changed files with 54 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Samples/5_Domain_Specific/simpleVulkan/CMakeLists.txt
View File

@ -29,8 +29,17 @@ include(CheckIncludeFile)
# Check for the GLFW/glfw3.h header # Check for the GLFW/glfw3.h header
check_include_file("GLFW/glfw3.h" HAVE_GLFW3_H) check_include_file("GLFW/glfw3.h" HAVE_GLFW3_H)
# Find GLFW header and lib for Windows # Check for SUSE Linux
if(WIN32 OR CMAKE_CROSSCOMPILING) if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
file(READ "/etc/os-release" OS_RELEASE_CONTENTS)
if(OS_RELEASE_CONTENTS MATCHES "ID=[^ ]*suse[^ ]*")
message(STATUS "SUSE Linux detected")
set(SUSE_LINUX TRUE)
endif()
endif()
# Find GLFW header and lib for Windows and SUSE Linux
if(WIN32 OR CMAKE_CROSSCOMPILING OR SUSE_LINUX)
set(GLFW_INCLUDE_DIRS "${GLFW_INCLUDE_DIR}" "${CMAKE_INCLUDE_PATH}") set(GLFW_INCLUDE_DIRS "${GLFW_INCLUDE_DIR}" "${CMAKE_INCLUDE_PATH}")
find_file(GLFW3_H "GLFW/glfw3.h" PATHS ${GLFW_INCLUDE_DIRS}) find_file(GLFW3_H "GLFW/glfw3.h" PATHS ${GLFW_INCLUDE_DIRS})
find_library(GLFW3_LIB find_library(GLFW3_LIB
@ -64,7 +73,7 @@ if(${Vulkan_FOUND})
${Vulkan_LIBRARIES} ${Vulkan_LIBRARIES}
OpenGL::GL OpenGL::GL
) )
if(WIN32 OR CMAKE_CROSSCOMPILING) if(WIN32 OR CMAKE_CROSSCOMPILING OR SUSE_LINUX)
target_include_directories(simpleVulkan PUBLIC target_include_directories(simpleVulkan PUBLIC
${GLFW_INCLUDE_DIRS} ${GLFW_INCLUDE_DIRS}
) )
@ -76,6 +85,12 @@ if(${Vulkan_FOUND})
glfw glfw
) )
endif() endif()
# Need to add X11 for SUSE Linux explicitly
if(SUSE_LINUX)
target_link_libraries(simpleVulkan
X11
)
endif()
add_custom_command(TARGET simpleVulkan POST_BUILD add_custom_command(TARGET simpleVulkan POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/sinewave.frag ${CMAKE_CURRENT_SOURCE_DIR}/sinewave.frag

21
Samples/5_Domain_Specific/simpleVulkanMMAP/CMakeLists.txt
View File

@ -28,8 +28,17 @@ include(CheckIncludeFile)
# Check for the GLFW/glfw3.h header # Check for the GLFW/glfw3.h header
check_include_file("GLFW/glfw3.h" HAVE_GLFW3_H) check_include_file("GLFW/glfw3.h" HAVE_GLFW3_H)
# Find GLFW header and lib for Windows # Check for SUSE Linux
if(WIN32 OR CMAKE_CROSSCOMPILING) if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
file(READ "/etc/os-release" OS_RELEASE_CONTENTS)
if(OS_RELEASE_CONTENTS MATCHES "ID=[^ ]*suse[^ ]*")
message(STATUS "SUSE Linux detected")
set(SUSE_LINUX TRUE)
endif()
endif()
# Find GLFW header and lib for Windows and SUSE Linux
if(WIN32 OR CMAKE_CROSSCOMPILING OR SUSE_LINUX)
set(GLFW_INCLUDE_DIRS "${GLFW_INCLUDE_DIR}" "${CMAKE_INCLUDE_PATH}") set(GLFW_INCLUDE_DIRS "${GLFW_INCLUDE_DIR}" "${CMAKE_INCLUDE_PATH}")
find_file(GLFW3_H "GLFW/glfw3.h" PATHS ${GLFW_INCLUDE_DIRS}) find_file(GLFW3_H "GLFW/glfw3.h" PATHS ${GLFW_INCLUDE_DIRS})
find_library(GLFW3_LIB find_library(GLFW3_LIB
@ -64,7 +73,7 @@ if(${Vulkan_FOUND})
OpenGL::GL OpenGL::GL
CUDA::cuda_driver CUDA::cuda_driver
) )
if(WIN32 OR CMAKE_CROSSCOMPILING) if(WIN32 OR CMAKE_CROSSCOMPILING OR SUSE_LINUX)
target_include_directories(simpleVulkanMMAP PUBLIC target_include_directories(simpleVulkanMMAP PUBLIC
${GLFW_INCLUDE_DIRS} ${GLFW_INCLUDE_DIRS}
) )
@ -76,6 +85,12 @@ if(${Vulkan_FOUND})
glfw glfw
) )
endif() endif()
# Need to add X11 for SUSE Linux explicitly
if(SUSE_LINUX)
target_link_libraries(simpleVulkanMMAP
X11
)
endif()
add_custom_command(TARGET simpleVulkanMMAP POST_BUILD add_custom_command(TARGET simpleVulkanMMAP POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/montecarlo.frag ${CMAKE_CURRENT_SOURCE_DIR}/montecarlo.frag

21
Samples/5_Domain_Specific/vulkanImageCUDA/CMakeLists.txt
View File

@ -28,8 +28,17 @@ include(CheckIncludeFile)
# Check for the GLFW/glfw3.h header # Check for the GLFW/glfw3.h header
check_include_file("GLFW/glfw3.h" HAVE_GLFW3_H) check_include_file("GLFW/glfw3.h" HAVE_GLFW3_H)
# Find GLFW header and lib for Windows # Check for SUSE Linux
if(WIN32 OR CMAKE_CROSSCOMPILING) if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
file(READ "/etc/os-release" OS_RELEASE_CONTENTS)
if(OS_RELEASE_CONTENTS MATCHES "ID=[^ ]*suse[^ ]*")
message(STATUS "SUSE Linux detected")
set(SUSE_LINUX TRUE)
endif()
endif()
# Find GLFW header and lib for Windows and SUSE Linux
if(WIN32 OR CMAKE_CROSSCOMPILING OR SUSE_LINUX)
set(GLFW_INCLUDE_DIRS "${GLFW_INCLUDE_DIR}" "${CMAKE_INCLUDE_PATH}") set(GLFW_INCLUDE_DIRS "${GLFW_INCLUDE_DIR}" "${CMAKE_INCLUDE_PATH}")
find_file(GLFW3_H "GLFW/glfw3.h" PATHS ${GLFW_INCLUDE_DIRS}) find_file(GLFW3_H "GLFW/glfw3.h" PATHS ${GLFW_INCLUDE_DIRS})
find_library(GLFW3_LIB find_library(GLFW3_LIB
@ -63,7 +72,7 @@ if(${Vulkan_FOUND})
${Vulkan_LIBRARIES} ${Vulkan_LIBRARIES}
OpenGL::GL OpenGL::GL
) )
if(WIN32 OR CMAKE_CROSSCOMPILING) if(WIN32 OR CMAKE_CROSSCOMPILING OR SUSE_LINUX)
target_include_directories(vulkanImageCUDA PUBLIC target_include_directories(vulkanImageCUDA PUBLIC
${GLFW_INCLUDE_DIRS} ${GLFW_INCLUDE_DIRS}
) )
@ -75,6 +84,12 @@ if(${Vulkan_FOUND})
glfw glfw
) )
endif() endif()
# Need to add X11 for SUSE Linux explicitly
if(SUSE_LINUX)
target_link_libraries(vulkanImageCUDA
X11
)
endif()
add_custom_command(TARGET vulkanImageCUDA POST_BUILD add_custom_command(TARGET vulkanImageCUDA POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/shader.frag ${CMAKE_CURRENT_SOURCE_DIR}/shader.frag