diff --git a/Samples/0_Introduction/matrixMulDrv/CMakeLists.txt b/Samples/0_Introduction/matrixMulDrv/CMakeLists.txt
index 47296bee..dd18576b 100644
--- a/Samples/0_Introduction/matrixMulDrv/CMakeLists.txt
+++ b/Samples/0_Introduction/matrixMulDrv/CMakeLists.txt
@@ -38,6 +38,12 @@ target_link_libraries(matrixMulDrv PUBLIC
 set(CUDA_FATBIN_FILE "${CMAKE_CURRENT_BINARY_DIR}/matrixMul_kernel64.fatbin")
 set(CUDA_KERNEL_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/matrixMul_kernel.cu")
 
+# Construct GENCODE_FLAGS explicitly from CUDA architectures
+set(GENCODE_FLAGS "")
+foreach(arch ${CMAKE_CUDA_ARCHITECTURES})
+    list(APPEND GENCODE_FLAGS "-gencode=arch=compute_${arch},code=sm_${arch}")
+endforeach()
+
 add_custom_command(
     OUTPUT ${CUDA_FATBIN_FILE}
     COMMAND ${CMAKE_CUDA_COMPILER} ${INCLUDES} ${ALL_CCFLAGS} -Wno-deprecated-gpu-targets  ${GENCODE_FLAGS} -o ${CUDA_FATBIN_FILE} -fatbin ${CUDA_KERNEL_SOURCE}
diff --git a/Samples/0_Introduction/simpleDrvRuntime/CMakeLists.txt b/Samples/0_Introduction/simpleDrvRuntime/CMakeLists.txt
index 84672fa8..0b70c4a1 100644
--- a/Samples/0_Introduction/simpleDrvRuntime/CMakeLists.txt
+++ b/Samples/0_Introduction/simpleDrvRuntime/CMakeLists.txt
@@ -40,6 +40,12 @@ target_link_libraries(simpleDrvRuntime PUBLIC
 set(CUDA_FATBIN_FILE "${CMAKE_CURRENT_BINARY_DIR}/vectorAdd_kernel64.fatbin")
 set(CUDA_KERNEL_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/vectorAdd_kernel.cu")
 
+# Construct GENCODE_FLAGS explicitly from CUDA architectures
+set(GENCODE_FLAGS "")
+foreach(arch ${CMAKE_CUDA_ARCHITECTURES})
+    list(APPEND GENCODE_FLAGS "-gencode=arch=compute_${arch},code=sm_${arch}")
+endforeach()
+
 add_custom_command(
     OUTPUT ${CUDA_FATBIN_FILE}
     COMMAND ${CMAKE_CUDA_COMPILER} ${INCLUDES} ${ALL_CCFLAGS} -Wno-deprecated-gpu-targets  ${GENCODE_FLAGS} -o ${CUDA_FATBIN_FILE} -fatbin ${CUDA_KERNEL_SOURCE}
diff --git a/Samples/0_Introduction/simpleTextureDrv/CMakeLists.txt b/Samples/0_Introduction/simpleTextureDrv/CMakeLists.txt
index 58ecb88a..cf44312b 100644
--- a/Samples/0_Introduction/simpleTextureDrv/CMakeLists.txt
+++ b/Samples/0_Introduction/simpleTextureDrv/CMakeLists.txt
@@ -37,6 +37,12 @@ target_link_libraries(simpleTextureDrv PUBLIC
 set(CUDA_FATBIN_FILE "${CMAKE_CURRENT_BINARY_DIR}/simpleTexture_kernel64.fatbin")
 set(CUDA_KERNEL_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/simpleTexture_kernel.cu")
 
+# Construct GENCODE_FLAGS explicitly from CUDA architectures
+set(GENCODE_FLAGS "")
+foreach(arch ${CMAKE_CUDA_ARCHITECTURES})
+    list(APPEND GENCODE_FLAGS "-gencode=arch=compute_${arch},code=sm_${arch}")
+endforeach()
+
 add_custom_command(
     OUTPUT ${CUDA_FATBIN_FILE}
     COMMAND ${CMAKE_CUDA_COMPILER} ${INCLUDES} ${ALL_CCFLAGS} -Wno-deprecated-gpu-targets  ${GENCODE_FLAGS} -o ${CUDA_FATBIN_FILE} -fatbin ${CUDA_KERNEL_SOURCE}
diff --git a/Samples/0_Introduction/vectorAddDrv/CMakeLists.txt b/Samples/0_Introduction/vectorAddDrv/CMakeLists.txt
index 8517dc1c..bf7f7328 100644
--- a/Samples/0_Introduction/vectorAddDrv/CMakeLists.txt
+++ b/Samples/0_Introduction/vectorAddDrv/CMakeLists.txt
@@ -37,6 +37,12 @@ target_link_libraries(vectorAddDrv PUBLIC
 set(CUDA_FATBIN_FILE "${CMAKE_CURRENT_BINARY_DIR}/vectorAdd_kernel64.fatbin")
 set(CUDA_KERNEL_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/vectorAdd_kernel.cu")
 
+# Construct GENCODE_FLAGS explicitly from CUDA architectures
+set(GENCODE_FLAGS "")
+foreach(arch ${CMAKE_CUDA_ARCHITECTURES})
+    list(APPEND GENCODE_FLAGS "-gencode=arch=compute_${arch},code=sm_${arch}")
+endforeach()
+
 add_custom_command(
     OUTPUT ${CUDA_FATBIN_FILE}
     COMMAND ${CMAKE_CUDA_COMPILER} ${INCLUDES} ${ALL_CCFLAGS} -Wno-deprecated-gpu-targets  ${GENCODE_FLAGS} -o ${CUDA_FATBIN_FILE} -fatbin ${CUDA_KERNEL_SOURCE}
diff --git a/Samples/0_Introduction/vectorAddMMAP/CMakeLists.txt b/Samples/0_Introduction/vectorAddMMAP/CMakeLists.txt
index e52fdfce..8e5292d8 100644
--- a/Samples/0_Introduction/vectorAddMMAP/CMakeLists.txt
+++ b/Samples/0_Introduction/vectorAddMMAP/CMakeLists.txt
@@ -40,6 +40,12 @@ else()
     set(CUDA_FATBIN_FILE "${CMAKE_CURRENT_BINARY_DIR}/vectorAdd_kernel64.fatbin")
     set(CUDA_KERNEL_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/vectorAdd_kernel.cu")
 
+    # Construct GENCODE_FLAGS explicitly from CUDA architectures
+    set(GENCODE_FLAGS "")
+    foreach(arch ${CMAKE_CUDA_ARCHITECTURES})
+        list(APPEND GENCODE_FLAGS "-gencode=arch=compute_${arch},code=sm_${arch}")
+    endforeach()
+
     add_custom_command(
         OUTPUT ${CUDA_FATBIN_FILE}
         COMMAND ${CMAKE_CUDA_COMPILER} ${INCLUDES} ${ALL_CCFLAGS} -Wno-deprecated-gpu-targets  ${GENCODE_FLAGS} -o ${CUDA_FATBIN_FILE} -fatbin ${CUDA_KERNEL_SOURCE}
diff --git a/Samples/2_Concepts_and_Techniques/threadMigration/CMakeLists.txt b/Samples/2_Concepts_and_Techniques/threadMigration/CMakeLists.txt
index 6459bc3c..2e43fbd9 100644
--- a/Samples/2_Concepts_and_Techniques/threadMigration/CMakeLists.txt
+++ b/Samples/2_Concepts_and_Techniques/threadMigration/CMakeLists.txt
@@ -42,6 +42,12 @@ endif()
 set(CUDA_FATBIN_FILE "${CMAKE_CURRENT_BINARY_DIR}/threadMigration_kernel64.fatbin")
 set(CUDA_KERNEL_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/threadMigration_kernel.cu")
 
+# Construct GENCODE_FLAGS explicitly from CUDA architectures
+set(GENCODE_FLAGS "")
+foreach(arch ${CMAKE_CUDA_ARCHITECTURES})
+    list(APPEND GENCODE_FLAGS "-gencode=arch=compute_${arch},code=sm_${arch}")
+endforeach()
+
 add_custom_command(
     OUTPUT ${CUDA_FATBIN_FILE}
     COMMAND ${CMAKE_CUDA_COMPILER} ${INCLUDES} ${ALL_CCFLAGS} -Wno-deprecated-gpu-targets  ${GENCODE_FLAGS} -o ${CUDA_FATBIN_FILE} -fatbin ${CUDA_KERNEL_SOURCE}
diff --git a/Samples/3_CUDA_Features/memMapIPCDrv/CMakeLists.txt b/Samples/3_CUDA_Features/memMapIPCDrv/CMakeLists.txt
index b3ae7989..a8710bfc 100644
--- a/Samples/3_CUDA_Features/memMapIPCDrv/CMakeLists.txt
+++ b/Samples/3_CUDA_Features/memMapIPCDrv/CMakeLists.txt
@@ -44,7 +44,7 @@ set(CUDA_KERNEL_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/memMapIpc_kernel.cu")
 
 add_custom_command(
     OUTPUT ${CUDA_PTX_FILE}
-    COMMAND ${CMAKE_CUDA_COMPILER} ${INCLUDES} ${ALL_CCFLAGS} -Wno-deprecated-gpu-targets  ${GENCODE_FLAGS} -o ${CUDA_PTX_FILE} -ptx ${CUDA_KERNEL_SOURCE}
+    COMMAND ${CMAKE_CUDA_COMPILER} ${INCLUDES} ${ALL_CCFLAGS} -Wno-deprecated-gpu-targets -o ${CUDA_PTX_FILE} -ptx ${CUDA_KERNEL_SOURCE}
     DEPENDS ${CUDA_KERNEL_SOURCE}
     COMMENT "Building CUDA PTX: ${CUDA_PTX_FILE}"
 )
diff --git a/Samples/3_CUDA_Features/ptxjit/CMakeLists.txt b/Samples/3_CUDA_Features/ptxjit/CMakeLists.txt
index 059dd86f..5a6b4f34 100644
--- a/Samples/3_CUDA_Features/ptxjit/CMakeLists.txt
+++ b/Samples/3_CUDA_Features/ptxjit/CMakeLists.txt
@@ -41,7 +41,7 @@ set(CUDA_KERNEL_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/ptxjit_kernel.cu")
 
 add_custom_command(
     OUTPUT ${CUDA_PTX_FILE}
-    COMMAND ${CMAKE_CUDA_COMPILER} ${INCLUDES} ${ALL_CCFLAGS} -Wno-deprecated-gpu-targets  ${GENCODE_FLAGS} -o ${CUDA_PTX_FILE} -ptx ${CUDA_KERNEL_SOURCE}
+    COMMAND ${CMAKE_CUDA_COMPILER} ${INCLUDES} ${ALL_CCFLAGS} -Wno-deprecated-gpu-targets -o ${CUDA_PTX_FILE} -ptx ${CUDA_KERNEL_SOURCE}
     DEPENDS ${CUDA_KERNEL_SOURCE}
     COMMENT "Building CUDA PTX: ${CUDA_PTX_FILE}"
 )