Move GLES and QNX samples to platform-specific subdirectory

Samples/5_Domain_Specific/CMakeLists.txt

@@ -16,11 +16,8 @@ add_subdirectory(dwtHaar1D)
 add_subdirectory(dxtc)
 add_subdirectory(fastWalshTransform)
 add_subdirectory(fluidsGL)
-#add_subdirectory(fluidsGLES)
 add_subdirectory(marchingCubes)
 add_subdirectory(nbody)
-#add_subdirectory(nbody_opengles)
-#add_subdirectory(nbody_screen)
 add_subdirectory(p2pBandwidthLatencyTest)
 add_subdirectory(postProcessGL)
 add_subdirectory(quasirandomGenerator)
@@ -30,9 +27,6 @@ add_subdirectory(simpleD3D11)
 add_subdirectory(simpleD3D11Texture)
 add_subdirectory(simpleD3D12)
 add_subdirectory(simpleGL)
-#add_subdirectory(simpleGLES)
-#add_subdirectory(simpleGLES_EGLOutput)
-#add_subdirectory(simpleGLES_screen)
 add_subdirectory(simpleVulkan)
 add_subdirectory(simpleVulkanMMAP)
 add_subdirectory(smokeParticles)

Samples/5_Domain_Specific/fluidsGLES/CMakeLists.txt

@@ -1,29 +0,0 @@
-cmake_minimum_required(VERSION 3.20)
-
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules")
-
-project(fluidsGLES LANGUAGES C CXX CUDA)
-
-find_package(CUDAToolkit REQUIRED)
-
-set(CMAKE_CUDA_ARCHITECTURES 50 52 60 61 70 75 80 86 89 90)
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    # set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -G")  # enable cuda-gdb (expensive)
-endif()
-
-# Include directories and libraries
-include_directories(../../../Common)
-
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-# Source file
-# Add target for fluidsGLES
-add_executable(fluidsGLES fluidsGLES.cu)
-
-target_compile_options(fluidsGLES PRIVATE $<$<COMPILE_LANGUAGE:CUDA>:--extended-lambda>)
-
-target_compile_features(fluidsGLES PRIVATE cxx_std_17 cuda_std_17)
-
-set_target_properties(fluidsGLES PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
-else()
-    message(STATUS "Will not build sample fluidsGLES - requires Linux OS")
-endif()

Samples/8_Platform_Specific/Tegra/fluidsGLES/CMakeLists.txt

@@ -0,0 +1,45 @@
+cmake_minimum_required(VERSION 3.20)
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules")
+
+project(fluidsGLES LANGUAGES C CXX CUDA)
+
+find_package(CUDAToolkit REQUIRED)
+
+set(CMAKE_CUDA_ARCHITECTURES 50 52 60 61 70 75 80 86 89 90)
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    # set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -G")  # enable cuda-gdb (expensive)
+endif()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    find_package (OpenGL COMPONENTS EGL GLES2)
+    if(${OpenGL_EGL_FOUND})
+        # Source file
+        # Add target for fluidsGLES
+        add_executable(fluidsGLES 
+            fluidsGLES.cpp
+            fluidsGLES_kernels.cu
+        )
+
+        target_compile_options(fluidsGLES PRIVATE $<$<COMPILE_LANGUAGE:CUDA>:--extended-lambda>)
+
+        target_compile_features(fluidsGLES PRIVATE cxx_std_17 cuda_std_17)
+
+        set_target_properties(fluidsGLES PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
+
+        target_include_directories(fluidsGLES PUBLIC
+            ${OPENGL_INCLUDE_DIRS}
+            ${CUDAToolkit_INCLUDE_DIRS}
+            ../../../Common
+        )
+
+        target_link_libraries(fluidsGLES
+            ${OPENGL_LIBRARIES}
+            CUDA::cuda_driver
+        )
+    else()
+        message(STATUS "EGL not found - will not build sample 'fluidsGLES'")
+    endif()
+else()
+    message(STATUS "Will not build sample fluidsGLES - requires Linux OS")
+endif()

Samples/8_Platform_Specific/Tegra/fluidsGLES/fluidsGLES.cpp

@@ -40,7 +40,7 @@ void error_exit(const char* format, ... )
 #include <cufft.h>
 
 // CUDA helper functions
-#include <helper_functions.h>
+#include "helper_functions.h"
 #include <rendercheck_gles.h>
 #include <helper_cuda.h>