From 30b411ad5652df618b93ac1f551c127af46931f6 Mon Sep 17 00:00:00 2001 From: Rob Armstrong Date: Tue, 4 Feb 2025 09:47:02 -0800 Subject: [PATCH] boxFilter: Fix malformed CMakeLists.txt --- .../boxFilter/CMakeLists.txt | 49 ++++++++++--------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/Samples/2_Concepts_and_Techniques/boxFilter/CMakeLists.txt b/Samples/2_Concepts_and_Techniques/boxFilter/CMakeLists.txt index 58bcdd7f..edf7e8cc 100644 --- a/Samples/2_Concepts_and_Techniques/boxFilter/CMakeLists.txt +++ b/Samples/2_Concepts_and_Techniques/boxFilter/CMakeLists.txt @@ -8,7 +8,7 @@ find_package(CUDAToolkit REQUIRED) set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CUDA_ARCHITECTURES 50 52 60 61 70 72 75 80 86 87 89 90 100 101 120) +set(CMAKE_CUDA_ARCHITECTURES all-major) if(CMAKE_BUILD_TYPE STREQUAL "Debug") # set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -G") # enable cuda-gdb (expensive) endif() @@ -25,9 +25,9 @@ if(${OpenGL_FOUND}) # Add target for boxFilter add_executable(boxFilter boxFilter.cpp boxFilter_cpu.cpp boxFilter_kernel.cu) -target_compile_options(boxFilter PRIVATE $<$:--extended-lambda>) + target_compile_options(boxFilter PRIVATE $<$:--extended-lambda>) -target_compile_features(boxFilter PRIVATE cxx_std_17 cuda_std_17) + target_compile_features(boxFilter PRIVATE cxx_std_17 cuda_std_17) set_target_properties(boxFilter PROPERTIES CUDA_SEPARABLE_COMPILATION ON) @@ -41,30 +41,31 @@ target_compile_features(boxFilter PRIVATE cxx_std_17 cuda_std_17) ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} ) + + # Copy data files to output directory + add_custom_command(TARGET boxFilter POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${CMAKE_CURRENT_SOURCE_DIR}/data/teapot1024.ppm + ${CMAKE_CURRENT_BINARY_DIR}/ + ) + + # Copy data files to output directory + add_custom_command(TARGET boxFilter POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${CMAKE_CURRENT_SOURCE_DIR}/data/ref_14.ppm + ${CMAKE_CURRENT_BINARY_DIR}/ + ) + + # Copy data files to output directory + add_custom_command(TARGET boxFilter POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${CMAKE_CURRENT_SOURCE_DIR}/data/ref_22.ppm + ${CMAKE_CURRENT_BINARY_DIR}/ + ) + else() message(STATUS "GLUT not found - will not build sample 'boxFilter'") endif() else() message(STATUS "OpenGL not found - will not build sample 'boxFilter'") endif() - -# Copy data files to output directory -add_custom_command(TARGET boxFilter POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${CMAKE_CURRENT_SOURCE_DIR}/data/teapot1024.ppm - ${CMAKE_CURRENT_BINARY_DIR}/ -) - -# Copy data files to output directory -add_custom_command(TARGET boxFilter POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${CMAKE_CURRENT_SOURCE_DIR}/data/ref_14.ppm - ${CMAKE_CURRENT_BINARY_DIR}/ -) - -# Copy data files to output directory -add_custom_command(TARGET boxFilter POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${CMAKE_CURRENT_SOURCE_DIR}/data/ref_22.ppm - ${CMAKE_CURRENT_BINARY_DIR}/ -)