Merge branch 'shawnz_bug_fix' into 'master'

Shawnz bug fix

See merge request cuda-samples/cuda-samples!134
This commit is contained in:
Rob Armstrong 2025-09-24 12:19:02 -07:00
commit 57e870596c
2 changed files with 6 additions and 3 deletions

View File

@ -54,8 +54,8 @@
#endif
#include <vector>
// Simple filesystem compatibility for GCC 7.x
#if defined(__GNUC__) && __GNUC__ < 8
// Simple filesystem compatibility for GCC 8.x
#if defined(__GNUC__) && __GNUC__ < 9
#include <cstdlib>
#include <string>
inline std::string getSocketFolder() {

View File

@ -39,7 +39,10 @@ if(${OpenGL_FOUND})
# Add target for particles
add_executable(particles particleSystem.cpp particleSystem_cuda.cu particles.cpp render_particles.cpp shaders.cpp)
target_compile_options(particles PRIVATE $<$<COMPILE_LANGUAGE:CUDA>:--extended-lambda>)
target_compile_options(particles PRIVATE
$<$<COMPILE_LANGUAGE:CUDA>:--extended-lambda>
$<$<AND:$<COMPILE_LANGUAGE:CUDA>,$<BOOL:${MSVC}>>:-Xcompiler="/Zc:preprocessor">
)
target_compile_features(particles PRIVATE cxx_std_17 cuda_std_17)