From 281daef2795a773797646d32cd076baaef878f50 Mon Sep 17 00:00:00 2001
From: Rob Armstrong <roarmstrong@nvidia.com>
Date: Mon, 16 Dec 2024 14:30:38 -0800
Subject: [PATCH] Refactor CMakeLists.txt under 1_Utilities

---
 .../1_Utilities/bandwidthTest/CMakeLists.txt  | 24 +++++++++++++++----
 .../1_Utilities/deviceQuery/CMakeLists.txt    | 24 +++++++++++++++----
 .../1_Utilities/deviceQueryDrv/CMakeLists.txt | 24 +++++++++++++++----
 .../1_Utilities/topologyQuery/CMakeLists.txt  | 24 +++++++++++++++----
 4 files changed, 76 insertions(+), 20 deletions(-)

diff --git a/Samples/1_Utilities/bandwidthTest/CMakeLists.txt b/Samples/1_Utilities/bandwidthTest/CMakeLists.txt
index 3ac6e1a5..a6881c69 100644
--- a/Samples/1_Utilities/bandwidthTest/CMakeLists.txt
+++ b/Samples/1_Utilities/bandwidthTest/CMakeLists.txt
@@ -1,11 +1,25 @@
+cmake_minimum_required(VERSION 3.20)
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules")
+
+project(bandwidthTest LANGUAGES C CXX CUDA)
+
+find_package(CUDAToolkit REQUIRED)
+
+set(CMAKE_CUDA_ARCHITECTURES "native")
+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)
 
 # Source file
-set(SRC_FILES
-    bandwidthTest.cu
-)
-
 # Add target for bandwidthTest
-add_executable(bandwidthTest ${SRC_FILES})
+add_executable(bandwidthTest bandwidthTest.cu)
+
+target_compile_options(bandwidthTest PRIVATE $<$<COMPILE_LANGUAGE:CUDA>:--extended-lambda>)
+
+target_compile_features(bandwidthTest PRIVATE cxx_std_17 cuda_std_17)
+
 set_target_properties(bandwidthTest PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
diff --git a/Samples/1_Utilities/deviceQuery/CMakeLists.txt b/Samples/1_Utilities/deviceQuery/CMakeLists.txt
index b13a9b82..10ac538d 100644
--- a/Samples/1_Utilities/deviceQuery/CMakeLists.txt
+++ b/Samples/1_Utilities/deviceQuery/CMakeLists.txt
@@ -1,13 +1,27 @@
+cmake_minimum_required(VERSION 3.20)
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules")
+
+project(deviceQuery LANGUAGES C CXX CUDA)
+
+find_package(CUDAToolkit REQUIRED)
+
+set(CMAKE_CUDA_ARCHITECTURES "native")
+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)
 
 # Source file
-set(SRC_FILES
-    deviceQuery.cpp
-)
-
 # Add target for deviceQuery
-add_executable(deviceQuery ${SRC_FILES})
+add_executable(deviceQuery deviceQuery.cpp)
+
+target_compile_options(deviceQuery PRIVATE $<$<COMPILE_LANGUAGE:CUDA>:--extended-lambda>)
+
+target_compile_features(deviceQuery PRIVATE cxx_std_17 cuda_std_17)
+
 set_target_properties(deviceQuery PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
 
 target_include_directories(deviceQuery PRIVATE
diff --git a/Samples/1_Utilities/deviceQueryDrv/CMakeLists.txt b/Samples/1_Utilities/deviceQueryDrv/CMakeLists.txt
index 9568f888..9aa694e2 100644
--- a/Samples/1_Utilities/deviceQueryDrv/CMakeLists.txt
+++ b/Samples/1_Utilities/deviceQueryDrv/CMakeLists.txt
@@ -1,13 +1,27 @@
+cmake_minimum_required(VERSION 3.20)
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules")
+
+project(deviceQueryDrv LANGUAGES C CXX CUDA)
+
+find_package(CUDAToolkit REQUIRED)
+
+set(CMAKE_CUDA_ARCHITECTURES "native")
+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)
 
 # Source file
-set(SRC_FILES
-    deviceQueryDrv.cpp
-)
-
 # Add target for deviceQueryDrv
-add_executable(deviceQueryDrv ${SRC_FILES})
+add_executable(deviceQueryDrv deviceQueryDrv.cpp)
+
+target_compile_options(deviceQueryDrv PRIVATE $<$<COMPILE_LANGUAGE:CUDA>:--extended-lambda>)
+
+target_compile_features(deviceQueryDrv PRIVATE cxx_std_17 cuda_std_17)
+
 set_target_properties(deviceQueryDrv PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
 target_include_directories(deviceQueryDrv PRIVATE
     ${CUDAToolkit_INCLUDE_DIRS}
diff --git a/Samples/1_Utilities/topologyQuery/CMakeLists.txt b/Samples/1_Utilities/topologyQuery/CMakeLists.txt
index ba3f798b..ead61809 100644
--- a/Samples/1_Utilities/topologyQuery/CMakeLists.txt
+++ b/Samples/1_Utilities/topologyQuery/CMakeLists.txt
@@ -1,11 +1,25 @@
+cmake_minimum_required(VERSION 3.20)
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules")
+
+project(topologyQuery LANGUAGES C CXX CUDA)
+
+find_package(CUDAToolkit REQUIRED)
+
+set(CMAKE_CUDA_ARCHITECTURES "native")
+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)
 
 # Source file
-set(SRC_FILES
-    topologyQuery.cu
-)
-
 # Add target for topologyQuery
-add_executable(topologyQuery ${SRC_FILES})
+add_executable(topologyQuery topologyQuery.cu)
+
+target_compile_options(topologyQuery PRIVATE $<$<COMPILE_LANGUAGE:CUDA>:--extended-lambda>)
+
+target_compile_features(topologyQuery PRIVATE cxx_std_17 cuda_std_17)
+
 set_target_properties(topologyQuery PROPERTIES CUDA_SEPARABLE_COMPILATION ON)