diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98ebf175..e190a07a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.20)
 
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules")
+
 project(cuda-samples LANGUAGES C CXX CUDA)
 
 find_package(CUDAToolkit REQUIRED)
diff --git a/Samples/2_Concepts_and_Techniques/CMakeLists.txt b/Samples/2_Concepts_and_Techniques/CMakeLists.txt
index 7ad0d7e4..954c300c 100644
--- a/Samples/2_Concepts_and_Techniques/CMakeLists.txt
+++ b/Samples/2_Concepts_and_Techniques/CMakeLists.txt
@@ -1,6 +1,6 @@
-#add_subdirectory(EGLStream_CUDA_CrossGPU)
-#add_subdirectory(EGLStream_CUDA_Interop)
-#add_subdirectory(EGLSync_CUDAEvent_Interop)
+add_subdirectory(EGLStream_CUDA_CrossGPU)
+add_subdirectory(EGLStream_CUDA_Interop)
+add_subdirectory(EGLSync_CUDAEvent_Interop)
 add_subdirectory(FunctionPointers)
 add_subdirectory(MC_EstimatePiInlineP)
 add_subdirectory(MC_EstimatePiInlineQ)
diff --git a/Samples/2_Concepts_and_Techniques/EGLStream_CUDA_CrossGPU/CMakeLists.txt b/Samples/2_Concepts_and_Techniques/EGLStream_CUDA_CrossGPU/CMakeLists.txt
new file mode 100644
index 00000000..096bfc5b
--- /dev/null
+++ b/Samples/2_Concepts_and_Techniques/EGLStream_CUDA_CrossGPU/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Include directories and libraries
+include_directories(../../../Common)
+
+find_package(EGL)
+
+# Source file
+set(SRC_FILES
+    cuda_consumer.cpp
+    cuda_producer.cpp
+    eglstrm_common.cpp
+    kernel.cu
+    main.cpp
+)
+
+if(${EGL_FOUND})
+        # Add target for EGLStream_CUDA_CrossGPU
+        add_executable(EGLStream_CUDA_CrossGPU ${SRC_FILES})
+        set_target_properties(EGLStream_CUDA_CrossGPU PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
+
+        target_include_directories(EGLStream_CUDA_CrossGPU PUBLIC
+            ${EGL_INCLUDE_DIR}
+            ${CUDAToolkit_INCLUDE_DIRS}
+        )
+
+        target_link_libraries(EGLStream_CUDA_CrossGPU
+            ${EGL_LIBRARY}
+            CUDA::cuda_driver
+        )
+
+else()
+    message(STATUS "EGL not found - will not build sample 'EGLStream_CUDA_CrossGPU'")
+endif()
diff --git a/Samples/2_Concepts_and_Techniques/EGLStream_CUDA_CrossGPU/Makefile b/Samples/2_Concepts_and_Techniques/EGLStream_CUDA_CrossGPU/Makefile
deleted file mode 100644
index 19bb6649..00000000
--- a/Samples/2_Concepts_and_Techniques/EGLStream_CUDA_CrossGPU/Makefile
+++ /dev/null
@@ -1,449 +0,0 @@
-################################################################################
-# Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#  * Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#  * Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#  * Neither the name of NVIDIA CORPORATION nor the names of its
-#    contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-################################################################################
-#
-# Makefile project only supported on Mac OS X and Linux Platforms)
-#
-################################################################################
-
-# Location of the CUDA Toolkit
-CUDA_PATH ?= /usr/local/cuda
-
-##############################
-# start deprecated interface #
-##############################
-ifeq ($(x86_64),1)
-    $(info WARNING - x86_64 variable has been deprecated)
-    $(info WARNING - please use TARGET_ARCH=x86_64 instead)
-    TARGET_ARCH ?= x86_64
-endif
-ifeq ($(ARMv7),1)
-    $(info WARNING - ARMv7 variable has been deprecated)
-    $(info WARNING - please use TARGET_ARCH=armv7l instead)
-    TARGET_ARCH ?= armv7l
-endif
-ifeq ($(aarch64),1)
-    $(info WARNING - aarch64 variable has been deprecated)
-    $(info WARNING - please use TARGET_ARCH=aarch64 instead)
-    TARGET_ARCH ?= aarch64
-endif
-ifeq ($(ppc64le),1)
-    $(info WARNING - ppc64le variable has been deprecated)
-    $(info WARNING - please use TARGET_ARCH=ppc64le instead)
-    TARGET_ARCH ?= ppc64le
-endif
-ifneq ($(GCC),)
-    $(info WARNING - GCC variable has been deprecated)
-    $(info WARNING - please use HOST_COMPILER=$(GCC) instead)
-    HOST_COMPILER ?= $(GCC)
-endif
-ifneq ($(abi),)
-    $(error ERROR - abi variable has been removed)
-endif
-############################
-# end deprecated interface #
-############################
-
-# architecture
-HOST_ARCH   := $(shell uname -m)
-TARGET_ARCH ?= $(HOST_ARCH)
-ifneq (,$(filter $(TARGET_ARCH),x86_64 aarch64 sbsa ppc64le armv7l))
-    ifneq ($(TARGET_ARCH),$(HOST_ARCH))
-        ifneq (,$(filter $(TARGET_ARCH),x86_64 aarch64 sbsa ppc64le))
-            TARGET_SIZE := 64
-        else ifneq (,$(filter $(TARGET_ARCH),armv7l))
-            TARGET_SIZE := 32
-        endif
-    else
-        TARGET_SIZE := $(shell getconf LONG_BIT)
-    endif
-else
-    $(error ERROR - unsupported value $(TARGET_ARCH) for TARGET_ARCH!)
-endif
-
-# sbsa and aarch64 systems look similar. Need to differentiate them at host level for now.
-ifeq ($(HOST_ARCH),aarch64)
-    ifeq ($(CUDA_PATH)/targets/sbsa-linux,$(shell ls -1d $(CUDA_PATH)/targets/sbsa-linux 2>/dev/null))
-        HOST_ARCH := sbsa
-        TARGET_ARCH := sbsa
-    endif
-endif
-
-ifneq ($(TARGET_ARCH),$(HOST_ARCH))
-    ifeq (,$(filter $(HOST_ARCH)-$(TARGET_ARCH),aarch64-armv7l x86_64-armv7l x86_64-aarch64 x86_64-sbsa x86_64-ppc64le))
-        $(error ERROR - cross compiling from $(HOST_ARCH) to $(TARGET_ARCH) is not supported!)
-    endif
-endif
-
-# When on native aarch64 system with userspace of 32-bit, change TARGET_ARCH to armv7l
-ifeq ($(HOST_ARCH)-$(TARGET_ARCH)-$(TARGET_SIZE),aarch64-aarch64-32)
-    TARGET_ARCH = armv7l
-endif
-
-# operating system
-HOST_OS   := $(shell uname -s 2>/dev/null | tr "[:upper:]" "[:lower:]")
-TARGET_OS ?= $(HOST_OS)
-ifeq (,$(filter $(TARGET_OS),linux darwin qnx android))
-    $(error ERROR - unsupported value $(TARGET_OS) for TARGET_OS!)
-endif
-
-# host compiler
-ifdef HOST_COMPILER
- CUSTOM_HOST_COMPILER = 1
-endif
-
-ifeq ($(TARGET_OS),darwin)
-    ifeq ($(shell expr `xcodebuild -version | grep -i xcode | awk '{print $$2}' | cut -d'.' -f1` \>= 5),1)
-        HOST_COMPILER ?= clang++
-    endif
-else ifneq ($(TARGET_ARCH),$(HOST_ARCH))
-    ifeq ($(HOST_ARCH)-$(TARGET_ARCH),x86_64-armv7l)
-        ifeq ($(TARGET_OS),linux)
-            HOST_COMPILER ?= arm-linux-gnueabihf-g++
-        else ifeq ($(TARGET_OS),qnx)
-            ifeq ($(QNX_HOST),)
-                $(error ERROR - QNX_HOST must be passed to the QNX host toolchain)
-            endif
-            ifeq ($(QNX_TARGET),)
-                $(error ERROR - QNX_TARGET must be passed to the QNX target toolchain)
-            endif
-            export QNX_HOST
-            export QNX_TARGET
-            HOST_COMPILER ?= $(QNX_HOST)/usr/bin/arm-unknown-nto-qnx6.6.0eabi-g++
-        else ifeq ($(TARGET_OS),android)
-            HOST_COMPILER ?= arm-linux-androideabi-g++
-        endif
-    else ifeq ($(TARGET_ARCH),aarch64)
-        ifeq ($(TARGET_OS), linux)
-            HOST_COMPILER ?= aarch64-linux-gnu-g++
-        else ifeq ($(TARGET_OS),qnx)
-            ifeq ($(QNX_HOST),)
-                $(error ERROR - QNX_HOST must be passed to the QNX host toolchain)
-            endif
-            ifeq ($(QNX_TARGET),)
-                $(error ERROR - QNX_TARGET must be passed to the QNX target toolchain)
-            endif
-            export QNX_HOST
-            export QNX_TARGET
-            HOST_COMPILER ?= $(QNX_HOST)/usr/bin/q++
-        else ifeq ($(TARGET_OS), android)
-            HOST_COMPILER ?= aarch64-linux-android-clang++
-        endif
-    else ifeq ($(TARGET_ARCH),sbsa)
-        HOST_COMPILER ?= aarch64-linux-gnu-g++
-    else ifeq ($(TARGET_ARCH),ppc64le)
-        HOST_COMPILER ?= powerpc64le-linux-gnu-g++
-    endif
-endif
-HOST_COMPILER ?= g++
-NVCC          := $(CUDA_PATH)/bin/nvcc -ccbin $(HOST_COMPILER)
-
-# internal flags
-NVCCFLAGS   := -m${TARGET_SIZE}
-CCFLAGS     :=
-LDFLAGS     :=
-
-# build flags
-
-# Link flag for customized HOST_COMPILER with gcc realpath
-GCC_PATH := $(shell which gcc)
-ifeq ($(CUSTOM_HOST_COMPILER),1)
-    ifneq ($(filter /%,$(HOST_COMPILER)),)
-        ifneq ($(findstring gcc,$(HOST_COMPILER)),)
-            ifneq ($(GCC_PATH),$(HOST_COMPILER))
-                LDFLAGS += -lstdc++
-            endif
-        endif
-    endif
-endif
-
-ifeq ($(TARGET_OS),darwin)
-    LDFLAGS += -rpath $(CUDA_PATH)/lib
-    CCFLAGS += -arch $(HOST_ARCH)
-else ifeq ($(HOST_ARCH)-$(TARGET_ARCH)-$(TARGET_OS),x86_64-armv7l-linux)
-    LDFLAGS += --dynamic-linker=/lib/ld-linux-armhf.so.3
-    CCFLAGS += -mfloat-abi=hard
-else ifeq ($(TARGET_OS),android)
-    LDFLAGS += -pie
-    CCFLAGS += -fpie -fpic -fexceptions
-endif
-
-ifneq ($(TARGET_ARCH),$(HOST_ARCH))
-    ifeq ($(TARGET_ARCH)-$(TARGET_OS),armv7l-linux)
-        ifneq ($(TARGET_FS),)
-            GCCVERSIONLTEQ46 := $(shell expr `$(HOST_COMPILER) -dumpversion` \<= 4.6)
-            ifeq ($(GCCVERSIONLTEQ46),1)
-                CCFLAGS += --sysroot=$(TARGET_FS)
-            endif
-            LDFLAGS += --sysroot=$(TARGET_FS)
-            LDFLAGS += -rpath-link=$(TARGET_FS)/lib
-            LDFLAGS += -rpath-link=$(TARGET_FS)/usr/lib
-            LDFLAGS += -rpath-link=$(TARGET_FS)/usr/lib/arm-linux-gnueabihf
-        endif
-    endif
-    ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-linux)
-        ifneq ($(TARGET_FS),)
-            GCCVERSIONLTEQ46 := $(shell expr `$(HOST_COMPILER) -dumpversion` \<= 4.6)
-            ifeq ($(GCCVERSIONLTEQ46),1)
-                CCFLAGS += --sysroot=$(TARGET_FS)
-            endif
-            LDFLAGS += --sysroot=$(TARGET_FS)
-            LDFLAGS += -rpath-link=$(TARGET_FS)/lib -L$(TARGET_FS)/lib
-            LDFLAGS += -rpath-link=$(TARGET_FS)/lib/aarch64-linux-gnu -L$(TARGET_FS)/lib/aarch64-linux-gnu
-            LDFLAGS += -rpath-link=$(TARGET_FS)/usr/lib -L$(TARGET_FS)/usr/lib
-            LDFLAGS += -rpath-link=$(TARGET_FS)/usr/lib/aarch64-linux-gnu -L$(TARGET_FS)/usr/lib/aarch64-linux-gnu
-            LDFLAGS += --unresolved-symbols=ignore-in-shared-libs
-            CCFLAGS += -isystem=$(TARGET_FS)/usr/include -I$(TARGET_FS)/usr/include -I$(TARGET_FS)/usr/include/libdrm
-            CCFLAGS += -isystem=$(TARGET_FS)/usr/include/aarch64-linux-gnu -I$(TARGET_FS)/usr/include/aarch64-linux-gnu
-        endif
-    endif
-    ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-qnx)
-        NVCCFLAGS += -D_QNX_SOURCE
-        NVCCFLAGS += --qpp-config 8.3.0,gcc_ntoaarch64le
-        CCFLAGS += -DWIN_INTERFACE_CUSTOM -I/usr/include/aarch64-qnx-gnu
-        LDFLAGS += -lsocket
-        LDFLAGS += -L/usr/lib/aarch64-qnx-gnu
-        CCFLAGS += "-Wl\,-rpath-link\,/usr/lib/aarch64-qnx-gnu"
-        ifdef TARGET_OVERRIDE
-            LDFLAGS += -lslog2
-        endif
-
-        ifneq ($(TARGET_FS),)
-            LDFLAGS += -L$(TARGET_FS)/usr/lib
-            CCFLAGS += "-Wl\,-rpath-link\,$(TARGET_FS)/usr/lib"
-            LDFLAGS += -L$(TARGET_FS)/usr/libnvidia
-            CCFLAGS += "-Wl\,-rpath-link\,$(TARGET_FS)/usr/libnvidia"
-            CCFLAGS += -I$(TARGET_FS)/../include
-        endif
-    endif
-endif
-
-ifdef TARGET_OVERRIDE # cuda toolkit targets override
-    NVCCFLAGS += -target-dir $(TARGET_OVERRIDE)
-endif
-
-# Install directory of different arch
-CUDA_INSTALL_TARGET_DIR :=
-ifeq ($(TARGET_ARCH)-$(TARGET_OS),armv7l-linux)
-    CUDA_INSTALL_TARGET_DIR = targets/armv7-linux-gnueabihf/
-else ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-linux)
-    CUDA_INSTALL_TARGET_DIR = targets/aarch64-linux/
-else ifeq ($(TARGET_ARCH)-$(TARGET_OS),sbsa-linux)
-    CUDA_INSTALL_TARGET_DIR = targets/sbsa-linux/
-else ifeq ($(TARGET_ARCH)-$(TARGET_OS),armv7l-android)
-    CUDA_INSTALL_TARGET_DIR = targets/armv7-linux-androideabi/
-else ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-android)
-    CUDA_INSTALL_TARGET_DIR = targets/aarch64-linux-androideabi/
-else ifeq ($(TARGET_ARCH)-$(TARGET_OS),armv7l-qnx)
-    CUDA_INSTALL_TARGET_DIR = targets/ARMv7-linux-QNX/
-else ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-qnx)
-    CUDA_INSTALL_TARGET_DIR = targets/aarch64-qnx/
-else ifeq ($(TARGET_ARCH),ppc64le)
-    CUDA_INSTALL_TARGET_DIR = targets/ppc64le-linux/
-endif
-
-# Debug build flags
-ifeq ($(dbg),1)
-      NVCCFLAGS += -g -G
-      BUILD_TYPE := debug
-else
-      BUILD_TYPE := release
-endif
-
-ALL_CCFLAGS :=
-ALL_CCFLAGS += $(NVCCFLAGS)
-ALL_CCFLAGS += $(EXTRA_NVCCFLAGS)
-ALL_CCFLAGS += $(addprefix -Xcompiler ,$(CCFLAGS))
-ALL_CCFLAGS += $(addprefix -Xcompiler ,$(EXTRA_CCFLAGS))
-
-UBUNTU = $(shell lsb_release -i -s 2>/dev/null | grep -i ubuntu)
-
-SAMPLE_ENABLED := 1
-
-# This sample is not supported on Mac OSX
-ifeq ($(TARGET_OS),darwin)
-  $(info >>> WARNING - EGLStream_CUDA_CrossGPU is not supported on Mac OSX - waiving sample <<<)
-  SAMPLE_ENABLED := 0
-endif
-
-# This sample is not supported on android
-ifeq ($(TARGET_OS),android)
-  $(info >>> WARNING - EGLStream_CUDA_CrossGPU is not supported on android - waiving sample <<<)
-  SAMPLE_ENABLED := 0
-endif
-
-ALL_LDFLAGS :=
-ALL_LDFLAGS += $(ALL_CCFLAGS)
-ALL_LDFLAGS += $(addprefix -Xlinker ,$(LDFLAGS))
-ALL_LDFLAGS += $(addprefix -Xlinker ,$(EXTRA_LDFLAGS))
-
-# Common includes and paths for CUDA
-INCLUDES  := -I../../../Common
-LIBRARIES :=
-
-################################################################################
-
-# Makefile include to help find EGL Libraries
-include ./findegl.mk
-
-# EGL specific libraries
-ifneq ($(TARGET_OS),darwin)
- LIBRARIES += -lEGL
-endif
-
-# Gencode arguments
-ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),armv7l aarch64 sbsa))
-SMS ?= 53 61 70 72 75 80 86 87 90
-else
-SMS ?= 50 52 60 61 70 75 80 86 89 90
-endif
-
-ifeq ($(SMS),)
-$(info >>> WARNING - no SM architectures have been specified - waiving sample <<<)
-SAMPLE_ENABLED := 0
-endif
-
-ifeq ($(GENCODE_FLAGS),)
-# Generate SASS code for each SM architecture listed in $(SMS)
-$(foreach sm,$(SMS),$(eval GENCODE_FLAGS += -gencode arch=compute_$(sm),code=sm_$(sm)))
-
-# Generate PTX code from the highest SM architecture in $(SMS) to guarantee forward-compatibility
-HIGHEST_SM := $(lastword $(sort $(SMS)))
-ifneq ($(HIGHEST_SM),)
-GENCODE_FLAGS += -gencode arch=compute_$(HIGHEST_SM),code=compute_$(HIGHEST_SM)
-endif
-endif
-
-ifeq ($(TARGET_OS),darwin)
-  ALL_LDFLAGS += -Xcompiler -F/Library/Frameworks -Xlinker -framework -Xlinker CUDA
-else
-  ifeq ($(TARGET_ARCH),x86_64)
-    CUDA_SEARCH_PATH ?= $(CUDA_PATH)/lib64/stubs
-    CUDA_SEARCH_PATH += $(CUDA_PATH)/lib/stubs
-    CUDA_SEARCH_PATH += $(CUDA_PATH)/targets/x86_64-linux/lib/stubs
-  endif
-
-  ifeq ($(TARGET_ARCH)-$(TARGET_OS),armv7l-linux)
-    CUDA_SEARCH_PATH ?= $(CUDA_PATH)/targets/armv7-linux-gnueabihf/lib/stubs
-  endif
-
-  ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-linux)
-    CUDA_SEARCH_PATH ?= $(CUDA_PATH)/targets/aarch64-linux/lib/stubs
-  endif
-
-  ifeq ($(TARGET_ARCH)-$(TARGET_OS),sbsa-linux)
-    CUDA_SEARCH_PATH ?= $(CUDA_PATH)/targets/sbsa-linux/lib/stubs
-  endif
-
-  ifeq ($(TARGET_ARCH)-$(TARGET_OS),armv7l-android)
-    CUDA_SEARCH_PATH ?= $(CUDA_PATH)/targets/armv7-linux-androideabi/lib/stubs
-  endif
-
-  ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-android)
-    CUDA_SEARCH_PATH ?= $(CUDA_PATH)/targets/aarch64-linux-androideabi/lib/stubs
-  endif
-
-  ifeq ($(TARGET_ARCH)-$(TARGET_OS),armv7l-qnx)
-    CUDA_SEARCH_PATH ?= $(CUDA_PATH)/targets/ARMv7-linux-QNX/lib/stubs
-  endif
-
-  ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-qnx)
-    CUDA_SEARCH_PATH ?= $(CUDA_PATH)/targets/aarch64-qnx/lib/stubs
-    ifdef TARGET_OVERRIDE
-        CUDA_SEARCH_PATH := $(CUDA_PATH)/targets/$(TARGET_OVERRIDE)/lib/stubs
-    endif
-  endif
-
-  ifeq ($(TARGET_ARCH),ppc64le)
-    CUDA_SEARCH_PATH ?= $(CUDA_PATH)/targets/ppc64le-linux/lib/stubs
-  endif
-
-  ifeq ($(HOST_ARCH),ppc64le)
-    CUDA_SEARCH_PATH += $(CUDA_PATH)/lib64/stubs
-  endif
-
-  CUDALIB ?= $(shell find -L $(CUDA_SEARCH_PATH) -maxdepth 1 -name libcuda.so 2> /dev/null)
-  ifeq ("$(CUDALIB)","")
-    $(info >>> WARNING - libcuda.so not found, CUDA Driver is not installed.  Please re-install the driver. <<<)
-    SAMPLE_ENABLED := 0
-  else
-    CUDALIB := $(shell echo $(CUDALIB) | sed "s/ .*//" | sed "s/\/libcuda.so//" )
-    LIBRARIES += -L$(CUDALIB) -lcuda
-  endif
-endif
-
-ALL_CCFLAGS += --threads 0 --std=c++11
-
-ifeq ($(SAMPLE_ENABLED),0)
-EXEC ?= @echo "[@]"
-endif
-
-################################################################################
-
-# Target rules
-all: build
-
-build: EGLStream_CUDA_CrossGPU
-
-check.deps:
-ifeq ($(SAMPLE_ENABLED),0)
-	@echo "Sample will be waived due to the above missing dependencies"
-else
-	@echo "Sample is ready - all dependencies have been met"
-endif
-
-cuda_consumer.o:cuda_consumer.cpp
-	$(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $<
-
-cuda_producer.o:cuda_producer.cpp
-	$(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $<
-
-eglstrm_common.o:eglstrm_common.cpp
-	$(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $<
-
-kernel.o:kernel.cu
-	$(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $<
-
-main.o:main.cpp
-	$(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $<
-
-EGLStream_CUDA_CrossGPU: cuda_consumer.o cuda_producer.o eglstrm_common.o kernel.o main.o
-	$(EXEC) $(NVCC) $(ALL_LDFLAGS) $(GENCODE_FLAGS) -o $@ $+ $(LIBRARIES)
-	$(EXEC) mkdir -p ../../../bin/$(TARGET_ARCH)/$(TARGET_OS)/$(BUILD_TYPE)
-	$(EXEC) cp $@ ../../../bin/$(TARGET_ARCH)/$(TARGET_OS)/$(BUILD_TYPE)
-
-run: build
-	$(EXEC) ./EGLStream_CUDA_CrossGPU
-
-testrun: build
-
-clean:
-	rm -f EGLStream_CUDA_CrossGPU cuda_consumer.o cuda_producer.o eglstrm_common.o kernel.o main.o
-	rm -rf ../../../bin/$(TARGET_ARCH)/$(TARGET_OS)/$(BUILD_TYPE)/EGLStream_CUDA_CrossGPU
-
-clobber: clean
diff --git a/Samples/2_Concepts_and_Techniques/EGLStream_CUDA_CrossGPU/NsightEclipse.xml b/Samples/2_Concepts_and_Techniques/EGLStream_CUDA_CrossGPU/NsightEclipse.xml
deleted file mode 100644
index 1a8152fd..00000000
--- a/Samples/2_Concepts_and_Techniques/EGLStream_CUDA_CrossGPU/NsightEclipse.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-<!DOCTYPE entry SYSTEM "SamplesInfo.dtd">
-<entry>
-  <name>EGLStream_CUDA_CrossGPU</name>
-  <cuda_api_list>
-    <driver>cuDeviceGetName</driver>
-    <driver>cuEGLStreamConsumerReleaseFrame</driver>
-    <driver>cuEGLStreamConsumerConnect</driver>
-    <driver>cuEGLStreamConsumerDisconnect</driver>
-    <driver>cuCtxPushCurrent</driver>
-    <driver>cuEGLStreamProducerReturnFrame</driver>
-    <driver>cuStreamCreate</driver>
-    <driver>cuEGLStreamProducerPresentFrame</driver>
-    <driver>cuMemFree</driver>
-    <driver>cuGraphicsResourceGetMappedEglFrame</driver>
-    <driver>cuInit</driver>
-    <driver>cuMemcpyHtoD</driver>
-    <driver>cuDeviceGet</driver>
-    <driver>cuEGLStreamConsumerAcquireFrame</driver>
-    <driver>cuEGLStreamProducerDisconnect</driver>
-    <driver>cuEGLStreamProducerConnect</driver>
-    <driver>cuDeviceGetAttribute</driver>
-    <driver>cuCtxSynchronize</driver>
-    <driver>cuMemAlloc</driver>
-    <driver>cuCtxPopCurrent</driver>
-    <driver>cuCtxCreate</driver>
-    <toolkit>cudaMemcpy</toolkit>
-    <toolkit>cudaMalloc</toolkit>
-    <toolkit>cudaProducerPresentFrame</toolkit>
-    <toolkit>cudaFree</toolkit>
-    <toolkit>cudaGetErrorString</toolkit>
-    <toolkit>cudaConsumerReleaseFrame</toolkit>
-    <toolkit>cudaProducerReturnFrame</toolkit>
-    <toolkit>cudaDeviceSynchronize</toolkit>
-    <toolkit>cudaDeviceCreateProducer</toolkit>
-    <toolkit>cudaProducerDeinit</toolkit>
-    <toolkit>cudaProducerPrepareFrame</toolkit>
-    <toolkit>cudaGetValueMismatch</toolkit>
-    <toolkit>cudaConsumerAcquireFrame</toolkit>
-    <toolkit>cudaProducerInit</toolkit>
-    <toolkit>cudaDeviceCreateConsumer</toolkit>
-  </cuda_api_list>
-  <description><![CDATA[Demonstrates CUDA and EGL Streams interop, where consumer's EGL Stream is on one GPU and producer's on other and both consumer-producer are different processes.]]></description>
-  <devicecompilation>whole</devicecompilation>
-  <includepaths>
-    <path>./</path>
-    <path>../</path>
-    <path>../../../Common</path>
-  </includepaths>
-  <keyconcepts>
-    <concept level="basic">EGLStreams Interop</concept>
-  </keyconcepts>
-  <keywords>
-    <keyword>EGL Streams</keyword>
-  </keywords>
-  <libraries>
-    <library os="linux">cuda</library>
-    <library framework="true" os="macosx">CUDA</library>
-  </libraries>
-  <librarypaths>
-  </librarypaths>
-  <nsight_eclipse>true</nsight_eclipse>
-  <primary_file>main.cpp</primary_file>
-  <required_dependencies>
-    <dependency>EGL</dependency>
-  </required_dependencies>
-  <scopes>
-    <scope>1:CUDA Advanced Topics</scope>
-    <scope>2:Graphics Interop</scope>
-  </scopes>
-  <sm-arch>sm50</sm-arch>
-  <sm-arch>sm52</sm-arch>
-  <sm-arch>sm53</sm-arch>
-  <sm-arch>sm60</sm-arch>
-  <sm-arch>sm61</sm-arch>
-  <sm-arch>sm70</sm-arch>
-  <sm-arch>sm72</sm-arch>
-  <sm-arch>sm75</sm-arch>
-  <sm-arch>sm80</sm-arch>
-  <sm-arch>sm86</sm-arch>
-  <sm-arch>sm87</sm-arch>
-  <sm-arch>sm89</sm-arch>
-  <sm-arch>sm90</sm-arch>
-  <supported_envs>
-    <env>
-      <arch>x86_64</arch>
-      <platform>linux</platform>
-    </env>
-    <env>
-      <arch>arm</arch>
-    </env>
-    <env>
-      <arch>sbsa</arch>
-    </env>
-  </supported_envs>
-  <supported_sm_architectures>
-    <include>all</include>
-  </supported_sm_architectures>
-  <title>EGLStream_CUDA_CrossGPU</title>
-  <type>exe</type>
-</entry>
diff --git a/Samples/2_Concepts_and_Techniques/EGLStream_CUDA_CrossGPU/findegl.mk b/Samples/2_Concepts_and_Techniques/EGLStream_CUDA_CrossGPU/findegl.mk
deleted file mode 100644
index 33ec1a96..00000000
--- a/Samples/2_Concepts_and_Techniques/EGLStream_CUDA_CrossGPU/findegl.mk
+++ /dev/null
@@ -1,151 +0,0 @@
-################################################################################
-# Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#  * Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#  * Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#  * Neither the name of NVIDIA CORPORATION nor the names of its
-#    contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-################################################################################
-#
-#  findegl.mk is used to find the necessary EGL Libraries for specific distributions
-#               this is supported on Linux
-#
-################################################################################
-
-# Determine OS platform and unix distribution
-ifeq ("$(TARGET_OS)","linux")
-   # first search lsb_release
-   DISTRO  = $(shell lsb_release -i -s 2>/dev/null | tr "[:upper:]" "[:lower:]")
-   ifeq ("$(DISTRO)","")
-     # second search and parse /etc/issue
-     DISTRO = $(shell more /etc/issue | awk '{print $$1}' | sed '1!d' | sed -e "/^$$/d" 2>/dev/null | tr "[:upper:]" "[:lower:]")
-     # ensure data from /etc/issue is valid
-     ifeq (,$(filter $(DISTRO),ubuntu fedora red rhel centos suse))
-       DISTRO = 
-     endif
-     ifeq ("$(DISTRO)","")
-       # third, we can search in /etc/os-release or /etc/{distro}-release
-       DISTRO = $(shell awk '/ID/' /etc/*-release | sed 's/ID=//' | grep -v "VERSION" | grep -v "ID" | grep -v "DISTRIB")
-     endif
-   endif
-endif
-
-ifeq ("$(TARGET_OS)","linux")
-    # $(info) >> findegl.mk -> LINUX path <<<)
-    # Each set of Linux Distros have different paths for where to find their OpenGL libraries reside
-    UBUNTU = $(shell echo $(DISTRO) | grep -i ubuntu      >/dev/null 2>&1; echo $$?)
-    FEDORA = $(shell echo $(DISTRO) | grep -i fedora      >/dev/null 2>&1; echo $$?)
-    RHEL   = $(shell echo $(DISTRO) | grep -i 'red\|rhel' >/dev/null 2>&1; echo $$?)
-    CENTOS = $(shell echo $(DISTRO) | grep -i centos      >/dev/null 2>&1; echo $$?)
-    SUSE   = $(shell echo $(DISTRO) | grep -i 'suse\|sles' >/dev/null 2>&1; echo $$?)
-    KYLIN  = $(shell echo $(DISTRO) | grep -i kylin        >/dev/null 2>&1; echo $$?)
-    ifeq ("$(UBUNTU)","0")
-      ifeq ($(HOST_ARCH)-$(TARGET_ARCH),x86_64-armv7l)
-        GLPATH := /usr/arm-linux-gnueabihf/lib
-        GLLINK := -L/usr/arm-linux-gnueabihf/lib
-        ifneq ($(TARGET_FS),) 
-          GLPATH += $(TARGET_FS)/usr/lib/arm-linux-gnueabihf
-          GLLINK += -L$(TARGET_FS)/usr/lib/arm-linux-gnueabihf
-        endif
-      else ifeq ($(HOST_ARCH)-$(TARGET_ARCH),x86_64-aarch64)
-        GLPATH := /usr/aarch64-linux-gnu/lib
-        GLLINK := -L/usr/aarch64-linux-gnu/lib
-        ifneq ($(TARGET_FS),)
-          GLPATH += $(TARGET_FS)/usr/lib
-          GLPATH += $(TARGET_FS)/usr/lib/aarch64-linux-gnu
-          GLLINK += -L$(TARGET_FS)/usr/lib/aarch64-linux-gnu
-        endif 
-      else
-        UBUNTU_PKG_NAME = $(shell which dpkg >/dev/null 2>&1 && dpkg -l 'nvidia-*' | grep '^ii' | awk '{print $$2}' | head -1)
-        ifneq ("$(UBUNTU_PKG_NAME)","")
-          GLPATH    ?= /usr/lib/$(UBUNTU_PKG_NAME)
-          GLLINK    ?= -L/usr/lib/$(UBUNTU_PKG_NAME)
-        endif
-
-        DFLT_PATH ?= /usr/lib
-      endif
-    endif
-	
-	ifeq ("$(SUSE)","0")
-      GLPATH    ?= /usr/X11R6/lib64
-      GLLINK    ?= -L/usr/X11R6/lib64
-      DFLT_PATH ?= /usr/lib64
-    else 
-      GLPATH    ?= /usr/lib64/nvidia
-      GLLINK    ?= -L/usr/lib64/nvidia
-      DFLT_PATH ?= /usr/lib64
-    endif
-
-  EGLLIB  := $(shell find -L $(GLPATH) $(DFLT_PATH) -name libEGL.so    -print 2>/dev/null)
-
-  ifeq ("$(EGLLIB)","")
-      $(info >>> WARNING - libEGL.so not found, please install libEGL.so <<<)
-      SAMPLE_ENABLED := 0
-  endif
-
-  HEADER_SEARCH_PATH ?= $(TARGET_FS)/usr/include
-  ifeq ($(HOST_ARCH)-$(TARGET_ARCH)-$(TARGET_OS),x86_64-armv7l-linux)
-      HEADER_SEARCH_PATH += /usr/arm-linux-gnueabihf/include
-  else ifeq ($(HOST_ARCH)-$(TARGET_ARCH)-$(TARGET_OS),x86_64-aarch64-linux)
-      HEADER_SEARCH_PATH += /usr/aarch64-linux-gnu/include
-  endif
-
-  EGLHEADER  := $(shell find -L $(HEADER_SEARCH_PATH) -name egl.h -print 2>/dev/null)
-  EGLEXTHEADER  := $(shell find -L $(HEADER_SEARCH_PATH) -name eglext.h -print 2>/dev/null)
-
-  ifeq ("$(EGLHEADER)","")
-      $(info >>> WARNING - egl.h not found, please install egl.h <<<)
-      SAMPLE_ENABLED := 0
-  endif
-  ifeq ("$(EGLEXTHEADER)","")
-      $(info >>> WARNING - eglext.h not found, please install eglext.h <<<)
-      SAMPLE_ENABLED := 0
-  endif
-else
-endif
-
-ifeq ("$(TARGET_OS)","qnx")
-    HOST_CCFLAGS := -V8.3.0,gcc_ntoaarch64le
-endif
-
-# Attempt to compile a minimal EGL application and run to check if EGL_SUPPORT_REUSE_NV is supported in the EGL headers available.
-ifneq ($(SAMPLE_ENABLED), 0)
-      $(shell printf "#include <EGL/egl.h>\n#include <EGL/eglext.h>\nint main() {\n#ifdef EGL_SUPPORT_REUSE_NV \n #error \"Compatible EGL header found\" \n  return 0;\n#endif \n return 1;\n}"  > test.c; )
-      EGL_DEFINES := $(shell $(HOST_COMPILER) $(HOST_CCFLAGS) $(CCFLAGS) $(EXTRA_CCFLAGS) -lEGL test.c -c 2>&1 | grep -ic "Compatible EGL header found";)
-      SHOULD_WAIVE := 0
-      ifeq ($(EGL_DEFINES),0)
-        SHOULD_WAIVE := 1
-      endif
-      ifeq ($(SHOULD_WAIVE),1)
-          $(info -----------------------------------------------------------------------------------------------)
-          $(info WARNING - NVIDIA EGL EXTENSIONS are not available in the present EGL headers)
-          $(info -----------------------------------------------------------------------------------------------)
-          $(info   This CUDA Sample cannot be built if the EGL NVIDIA EXTENSIONS like EGL_SUPPORT_REUSE_NV are not supported in EGL headers.)
-          $(info   This will be a dry-run of the Makefile.)
-          $(info   Please install the latest khronos EGL headers and libs to build this sample)
-          $(info -----------------------------------------------------------------------------------------------)
-          SAMPLE_ENABLED := 0
-      endif
-      $(shell rm test.o test.c 2>/dev/null)
-endif
-
diff --git a/Samples/2_Concepts_and_Techniques/EGLStream_CUDA_Interop/CMakeLists.txt b/Samples/2_Concepts_and_Techniques/EGLStream_CUDA_Interop/CMakeLists.txt
new file mode 100644
index 00000000..5254c630
--- /dev/null
+++ b/Samples/2_Concepts_and_Techniques/EGLStream_CUDA_Interop/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Include directories and libraries
+include_directories(../../../Common)
+
+find_package(EGL)
+
+# Source file
+set(SRC_FILES
+    cuda_consumer.cpp
+    cuda_producer.cpp
+    eglstrm_common.cpp
+    main.cpp
+)
+
+if(${EGL_FOUND})
+        # Add target for EGLStream_CUDA_Interop
+        add_executable(EGLStream_CUDA_Interop ${SRC_FILES})
+        set_target_properties(EGLStream_CUDA_Interop PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
+
+        target_include_directories(EGLStream_CUDA_Interop PUBLIC
+            ${EGL_INCLUDE_DIR}
+            ${CUDAToolkit_INCLUDE_DIRS}
+        )
+
+        target_link_libraries(EGLStream_CUDA_Interop
+            ${EGL_LIBRARY}
+            CUDA::cuda_driver
+        )
+
+else()
+    message(STATUS "EGL not found - will not build sample 'EGLStream_CUDA_Interop'")
+endif()
diff --git a/Samples/2_Concepts_and_Techniques/EGLStream_CUDA_Interop/Makefile b/Samples/2_Concepts_and_Techniques/EGLStream_CUDA_Interop/Makefile
deleted file mode 100644
index d061a588..00000000
--- a/Samples/2_Concepts_and_Techniques/EGLStream_CUDA_Interop/Makefile
+++ /dev/null
@@ -1,429 +0,0 @@
-################################################################################
-# Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#  * Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#  * Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#  * Neither the name of NVIDIA CORPORATION nor the names of its
-#    contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-################################################################################
-#
-# Makefile project only supported on Mac OS X and Linux Platforms)
-#
-################################################################################
-
-# Location of the CUDA Toolkit
-CUDA_PATH ?= /usr/local/cuda
-
-##############################
-# start deprecated interface #
-##############################
-ifeq ($(x86_64),1)
-    $(info WARNING - x86_64 variable has been deprecated)
-    $(info WARNING - please use TARGET_ARCH=x86_64 instead)
-    TARGET_ARCH ?= x86_64
-endif
-ifeq ($(ARMv7),1)
-    $(info WARNING - ARMv7 variable has been deprecated)
-    $(info WARNING - please use TARGET_ARCH=armv7l instead)
-    TARGET_ARCH ?= armv7l
-endif
-ifeq ($(aarch64),1)
-    $(info WARNING - aarch64 variable has been deprecated)
-    $(info WARNING - please use TARGET_ARCH=aarch64 instead)
-    TARGET_ARCH ?= aarch64
-endif
-ifeq ($(ppc64le),1)
-    $(info WARNING - ppc64le variable has been deprecated)
-    $(info WARNING - please use TARGET_ARCH=ppc64le instead)
-    TARGET_ARCH ?= ppc64le
-endif
-ifneq ($(GCC),)
-    $(info WARNING - GCC variable has been deprecated)
-    $(info WARNING - please use HOST_COMPILER=$(GCC) instead)
-    HOST_COMPILER ?= $(GCC)
-endif
-ifneq ($(abi),)
-    $(error ERROR - abi variable has been removed)
-endif
-############################
-# end deprecated interface #
-############################
-
-# architecture
-HOST_ARCH   := $(shell uname -m)
-TARGET_ARCH ?= $(HOST_ARCH)
-ifneq (,$(filter $(TARGET_ARCH),x86_64 aarch64 sbsa ppc64le armv7l))
-    ifneq ($(TARGET_ARCH),$(HOST_ARCH))
-        ifneq (,$(filter $(TARGET_ARCH),x86_64 aarch64 sbsa ppc64le))
-            TARGET_SIZE := 64
-        else ifneq (,$(filter $(TARGET_ARCH),armv7l))
-            TARGET_SIZE := 32
-        endif
-    else
-        TARGET_SIZE := $(shell getconf LONG_BIT)
-    endif
-else
-    $(error ERROR - unsupported value $(TARGET_ARCH) for TARGET_ARCH!)
-endif
-
-# sbsa and aarch64 systems look similar. Need to differentiate them at host level for now.
-ifeq ($(HOST_ARCH),aarch64)
-    ifeq ($(CUDA_PATH)/targets/sbsa-linux,$(shell ls -1d $(CUDA_PATH)/targets/sbsa-linux 2>/dev/null))
-        HOST_ARCH := sbsa
-        TARGET_ARCH := sbsa
-    endif
-endif
-
-ifneq ($(TARGET_ARCH),$(HOST_ARCH))
-    ifeq (,$(filter $(HOST_ARCH)-$(TARGET_ARCH),aarch64-armv7l x86_64-armv7l x86_64-aarch64 x86_64-sbsa x86_64-ppc64le))
-        $(error ERROR - cross compiling from $(HOST_ARCH) to $(TARGET_ARCH) is not supported!)
-    endif
-endif
-
-# When on native aarch64 system with userspace of 32-bit, change TARGET_ARCH to armv7l
-ifeq ($(HOST_ARCH)-$(TARGET_ARCH)-$(TARGET_SIZE),aarch64-aarch64-32)
-    TARGET_ARCH = armv7l
-endif
-
-# operating system
-HOST_OS   := $(shell uname -s 2>/dev/null | tr "[:upper:]" "[:lower:]")
-TARGET_OS ?= $(HOST_OS)
-ifeq (,$(filter $(TARGET_OS),linux darwin qnx android))
-    $(error ERROR - unsupported value $(TARGET_OS) for TARGET_OS!)
-endif
-
-# host compiler
-ifdef HOST_COMPILER
- CUSTOM_HOST_COMPILER = 1
-endif
-
-ifeq ($(TARGET_OS),darwin)
-    ifeq ($(shell expr `xcodebuild -version | grep -i xcode | awk '{print $$2}' | cut -d'.' -f1` \>= 5),1)
-        HOST_COMPILER ?= clang++
-    endif
-else ifneq ($(TARGET_ARCH),$(HOST_ARCH))
-    ifeq ($(HOST_ARCH)-$(TARGET_ARCH),x86_64-armv7l)
-        ifeq ($(TARGET_OS),linux)
-            HOST_COMPILER ?= arm-linux-gnueabihf-g++
-        else ifeq ($(TARGET_OS),qnx)
-            ifeq ($(QNX_HOST),)
-                $(error ERROR - QNX_HOST must be passed to the QNX host toolchain)
-            endif
-            ifeq ($(QNX_TARGET),)
-                $(error ERROR - QNX_TARGET must be passed to the QNX target toolchain)
-            endif
-            export QNX_HOST
-            export QNX_TARGET
-            HOST_COMPILER ?= $(QNX_HOST)/usr/bin/arm-unknown-nto-qnx6.6.0eabi-g++
-        else ifeq ($(TARGET_OS),android)
-            HOST_COMPILER ?= arm-linux-androideabi-g++
-        endif
-    else ifeq ($(TARGET_ARCH),aarch64)
-        ifeq ($(TARGET_OS), linux)
-            HOST_COMPILER ?= aarch64-linux-gnu-g++
-        else ifeq ($(TARGET_OS),qnx)
-            ifeq ($(QNX_HOST),)
-                $(error ERROR - QNX_HOST must be passed to the QNX host toolchain)
-            endif
-            ifeq ($(QNX_TARGET),)
-                $(error ERROR - QNX_TARGET must be passed to the QNX target toolchain)
-            endif
-            export QNX_HOST
-            export QNX_TARGET
-            HOST_COMPILER ?= $(QNX_HOST)/usr/bin/q++
-        else ifeq ($(TARGET_OS), android)
-            HOST_COMPILER ?= aarch64-linux-android-clang++
-        endif
-    else ifeq ($(TARGET_ARCH),sbsa)
-        HOST_COMPILER ?= aarch64-linux-gnu-g++
-    else ifeq ($(TARGET_ARCH),ppc64le)
-        HOST_COMPILER ?= powerpc64le-linux-gnu-g++
-    endif
-endif
-HOST_COMPILER ?= g++
-NVCC          := $(CUDA_PATH)/bin/nvcc -ccbin $(HOST_COMPILER)
-
-# internal flags
-NVCCFLAGS   := -m${TARGET_SIZE}
-CCFLAGS     :=
-LDFLAGS     :=
-
-# build flags
-
-# Link flag for customized HOST_COMPILER with gcc realpath
-GCC_PATH := $(shell which gcc)
-ifeq ($(CUSTOM_HOST_COMPILER),1)
-    ifneq ($(filter /%,$(HOST_COMPILER)),)
-        ifneq ($(findstring gcc,$(HOST_COMPILER)),)
-            ifneq ($(GCC_PATH),$(HOST_COMPILER))
-                LDFLAGS += -lstdc++
-            endif
-        endif
-    endif
-endif
-
-ifeq ($(TARGET_OS),darwin)
-    LDFLAGS += -rpath $(CUDA_PATH)/lib
-    CCFLAGS += -arch $(HOST_ARCH)
-else ifeq ($(HOST_ARCH)-$(TARGET_ARCH)-$(TARGET_OS),x86_64-armv7l-linux)
-    LDFLAGS += --dynamic-linker=/lib/ld-linux-armhf.so.3
-    CCFLAGS += -mfloat-abi=hard
-else ifeq ($(TARGET_OS),android)
-    LDFLAGS += -pie
-    CCFLAGS += -fpie -fpic -fexceptions
-endif
-
-ifneq ($(TARGET_ARCH),$(HOST_ARCH))
-    ifeq ($(TARGET_ARCH)-$(TARGET_OS),armv7l-linux)
-        ifneq ($(TARGET_FS),)
-            GCCVERSIONLTEQ46 := $(shell expr `$(HOST_COMPILER) -dumpversion` \<= 4.6)
-            ifeq ($(GCCVERSIONLTEQ46),1)
-                CCFLAGS += --sysroot=$(TARGET_FS)
-            endif
-            LDFLAGS += --sysroot=$(TARGET_FS)
-            LDFLAGS += -rpath-link=$(TARGET_FS)/lib
-            LDFLAGS += -rpath-link=$(TARGET_FS)/usr/lib
-            LDFLAGS += -rpath-link=$(TARGET_FS)/usr/lib/arm-linux-gnueabihf
-        endif
-    endif
-    ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-linux)
-        ifneq ($(TARGET_FS),)
-            GCCVERSIONLTEQ46 := $(shell expr `$(HOST_COMPILER) -dumpversion` \<= 4.6)
-            ifeq ($(GCCVERSIONLTEQ46),1)
-                CCFLAGS += --sysroot=$(TARGET_FS)
-            endif
-            LDFLAGS += --sysroot=$(TARGET_FS)
-            LDFLAGS += -rpath-link=$(TARGET_FS)/lib -L$(TARGET_FS)/lib
-            LDFLAGS += -rpath-link=$(TARGET_FS)/lib/aarch64-linux-gnu -L$(TARGET_FS)/lib/aarch64-linux-gnu
-            LDFLAGS += -rpath-link=$(TARGET_FS)/usr/lib -L$(TARGET_FS)/usr/lib
-            LDFLAGS += -rpath-link=$(TARGET_FS)/usr/lib/aarch64-linux-gnu -L$(TARGET_FS)/usr/lib/aarch64-linux-gnu
-            LDFLAGS += --unresolved-symbols=ignore-in-shared-libs
-            CCFLAGS += -isystem=$(TARGET_FS)/usr/include -I$(TARGET_FS)/usr/include -I$(TARGET_FS)/usr/include/libdrm
-            CCFLAGS += -isystem=$(TARGET_FS)/usr/include/aarch64-linux-gnu -I$(TARGET_FS)/usr/include/aarch64-linux-gnu
-        endif
-    endif
-    ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-qnx)
-        NVCCFLAGS += -D_QNX_SOURCE
-        NVCCFLAGS += --qpp-config 8.3.0,gcc_ntoaarch64le
-        CCFLAGS += -DWIN_INTERFACE_CUSTOM -I/usr/include/aarch64-qnx-gnu
-        LDFLAGS += -lsocket
-        LDFLAGS += -L/usr/lib/aarch64-qnx-gnu
-        CCFLAGS += "-Wl\,-rpath-link\,/usr/lib/aarch64-qnx-gnu"
-        ifdef TARGET_OVERRIDE
-            LDFLAGS += -lslog2
-        endif
-
-        ifneq ($(TARGET_FS),)
-            LDFLAGS += -L$(TARGET_FS)/usr/lib
-            CCFLAGS += "-Wl\,-rpath-link\,$(TARGET_FS)/usr/lib"
-            LDFLAGS += -L$(TARGET_FS)/usr/libnvidia
-            CCFLAGS += "-Wl\,-rpath-link\,$(TARGET_FS)/usr/libnvidia"
-            CCFLAGS += -I$(TARGET_FS)/../include
-        endif
-    endif
-endif
-
-ifdef TARGET_OVERRIDE # cuda toolkit targets override
-    NVCCFLAGS += -target-dir $(TARGET_OVERRIDE)
-endif
-
-# Install directory of different arch
-CUDA_INSTALL_TARGET_DIR :=
-ifeq ($(TARGET_ARCH)-$(TARGET_OS),armv7l-linux)
-    CUDA_INSTALL_TARGET_DIR = targets/armv7-linux-gnueabihf/
-else ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-linux)
-    CUDA_INSTALL_TARGET_DIR = targets/aarch64-linux/
-else ifeq ($(TARGET_ARCH)-$(TARGET_OS),sbsa-linux)
-    CUDA_INSTALL_TARGET_DIR = targets/sbsa-linux/
-else ifeq ($(TARGET_ARCH)-$(TARGET_OS),armv7l-android)
-    CUDA_INSTALL_TARGET_DIR = targets/armv7-linux-androideabi/
-else ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-android)
-    CUDA_INSTALL_TARGET_DIR = targets/aarch64-linux-androideabi/
-else ifeq ($(TARGET_ARCH)-$(TARGET_OS),armv7l-qnx)
-    CUDA_INSTALL_TARGET_DIR = targets/ARMv7-linux-QNX/
-else ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-qnx)
-    CUDA_INSTALL_TARGET_DIR = targets/aarch64-qnx/
-else ifeq ($(TARGET_ARCH),ppc64le)
-    CUDA_INSTALL_TARGET_DIR = targets/ppc64le-linux/
-endif
-
-# Debug build flags
-ifeq ($(dbg),1)
-      NVCCFLAGS += -g -G
-      BUILD_TYPE := debug
-else
-      BUILD_TYPE := release
-endif
-
-ALL_CCFLAGS :=
-ALL_CCFLAGS += $(NVCCFLAGS)
-ALL_CCFLAGS += $(EXTRA_NVCCFLAGS)
-ALL_CCFLAGS += $(addprefix -Xcompiler ,$(CCFLAGS))
-ALL_CCFLAGS += $(addprefix -Xcompiler ,$(EXTRA_CCFLAGS))
-
-UBUNTU = $(shell lsb_release -i -s 2>/dev/null | grep -i ubuntu)
-
-SAMPLE_ENABLED := 1
-
-# This sample is not supported on Mac OSX
-ifeq ($(TARGET_OS),darwin)
-  $(info >>> WARNING - EGLStream_CUDA_Interop is not supported on Mac OSX - waiving sample <<<)
-  SAMPLE_ENABLED := 0
-endif
-
-# This sample is not supported on ARMv7
-ifeq ($(TARGET_ARCH),armv7l)
-  $(info >>> WARNING - EGLStream_CUDA_Interop is not supported on ARMv7 - waiving sample <<<)
-  SAMPLE_ENABLED := 0
-endif
-
-# This sample is not supported on android
-ifeq ($(TARGET_OS),android)
-  $(info >>> WARNING - EGLStream_CUDA_Interop is not supported on android - waiving sample <<<)
-  SAMPLE_ENABLED := 0
-endif
-
-ALL_LDFLAGS :=
-ALL_LDFLAGS += $(ALL_CCFLAGS)
-ALL_LDFLAGS += $(addprefix -Xlinker ,$(LDFLAGS))
-ALL_LDFLAGS += $(addprefix -Xlinker ,$(EXTRA_LDFLAGS))
-
-# Common includes and paths for CUDA
-INCLUDES  := -I../../../Common
-LIBRARIES :=
-
-################################################################################
-
-# Makefile include to help find EGL Libraries
-include ./findegl.mk
-
-# EGL specific libraries
-ifneq ($(TARGET_OS),darwin)
- LIBRARIES += -lEGL
-endif
-
-ifeq ($(TARGET_OS),darwin)
-  ALL_LDFLAGS += -Xcompiler -F/Library/Frameworks -Xlinker -framework -Xlinker CUDA
-else
-  ifeq ($(TARGET_ARCH),x86_64)
-    CUDA_SEARCH_PATH ?= $(CUDA_PATH)/lib64/stubs
-    CUDA_SEARCH_PATH += $(CUDA_PATH)/lib/stubs
-    CUDA_SEARCH_PATH += $(CUDA_PATH)/targets/x86_64-linux/lib/stubs
-  endif
-
-  ifeq ($(TARGET_ARCH)-$(TARGET_OS),armv7l-linux)
-    CUDA_SEARCH_PATH ?= $(CUDA_PATH)/targets/armv7-linux-gnueabihf/lib/stubs
-  endif
-
-  ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-linux)
-    CUDA_SEARCH_PATH ?= $(CUDA_PATH)/targets/aarch64-linux/lib/stubs
-  endif
-
-  ifeq ($(TARGET_ARCH)-$(TARGET_OS),sbsa-linux)
-    CUDA_SEARCH_PATH ?= $(CUDA_PATH)/targets/sbsa-linux/lib/stubs
-  endif
-
-  ifeq ($(TARGET_ARCH)-$(TARGET_OS),armv7l-android)
-    CUDA_SEARCH_PATH ?= $(CUDA_PATH)/targets/armv7-linux-androideabi/lib/stubs
-  endif
-
-  ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-android)
-    CUDA_SEARCH_PATH ?= $(CUDA_PATH)/targets/aarch64-linux-androideabi/lib/stubs
-  endif
-
-  ifeq ($(TARGET_ARCH)-$(TARGET_OS),armv7l-qnx)
-    CUDA_SEARCH_PATH ?= $(CUDA_PATH)/targets/ARMv7-linux-QNX/lib/stubs
-  endif
-
-  ifeq ($(TARGET_ARCH)-$(TARGET_OS),aarch64-qnx)
-    CUDA_SEARCH_PATH ?= $(CUDA_PATH)/targets/aarch64-qnx/lib/stubs
-    ifdef TARGET_OVERRIDE
-        CUDA_SEARCH_PATH := $(CUDA_PATH)/targets/$(TARGET_OVERRIDE)/lib/stubs
-    endif
-  endif
-
-  ifeq ($(TARGET_ARCH),ppc64le)
-    CUDA_SEARCH_PATH ?= $(CUDA_PATH)/targets/ppc64le-linux/lib/stubs
-  endif
-
-  ifeq ($(HOST_ARCH),ppc64le)
-    CUDA_SEARCH_PATH += $(CUDA_PATH)/lib64/stubs
-  endif
-
-  CUDALIB ?= $(shell find -L $(CUDA_SEARCH_PATH) -maxdepth 1 -name libcuda.so 2> /dev/null)
-  ifeq ("$(CUDALIB)","")
-    $(info >>> WARNING - libcuda.so not found, CUDA Driver is not installed.  Please re-install the driver. <<<)
-    SAMPLE_ENABLED := 0
-  else
-    CUDALIB := $(shell echo $(CUDALIB) | sed "s/ .*//" | sed "s/\/libcuda.so//" )
-    LIBRARIES += -L$(CUDALIB) -lcuda
-  endif
-endif
-
-ALL_CCFLAGS += --threads 0 --std=c++11
-
-ifeq ($(SAMPLE_ENABLED),0)
-EXEC ?= @echo "[@]"
-endif
-
-################################################################################
-
-# Target rules
-all: build
-
-build: EGLStream_CUDA_Interop
-
-check.deps:
-ifeq ($(SAMPLE_ENABLED),0)
-	@echo "Sample will be waived due to the above missing dependencies"
-else
-	@echo "Sample is ready - all dependencies have been met"
-endif
-
-cuda_consumer.o:cuda_consumer.cpp
-	$(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $<
-
-cuda_producer.o:cuda_producer.cpp
-	$(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $<
-
-eglstrm_common.o:eglstrm_common.cpp
-	$(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $<
-
-main.o:main.cpp
-	$(EXEC) $(NVCC) $(INCLUDES) $(ALL_CCFLAGS) $(GENCODE_FLAGS) -o $@ -c $<
-
-EGLStream_CUDA_Interop: cuda_consumer.o cuda_producer.o eglstrm_common.o main.o
-	$(EXEC) $(NVCC) $(ALL_LDFLAGS) $(GENCODE_FLAGS) -o $@ $+ $(LIBRARIES)
-	$(EXEC) mkdir -p ../../../bin/$(TARGET_ARCH)/$(TARGET_OS)/$(BUILD_TYPE)
-	$(EXEC) cp $@ ../../../bin/$(TARGET_ARCH)/$(TARGET_OS)/$(BUILD_TYPE)
-
-run: build
-	$(EXEC) ./EGLStream_CUDA_Interop
-
-testrun: build
-
-clean:
-	rm -f EGLStream_CUDA_Interop cuda_consumer.o cuda_producer.o eglstrm_common.o main.o
-	rm -rf ../../../bin/$(TARGET_ARCH)/$(TARGET_OS)/$(BUILD_TYPE)/EGLStream_CUDA_Interop
-
-clobber: clean
diff --git a/Samples/2_Concepts_and_Techniques/EGLStream_CUDA_Interop/NsightEclipse.xml b/Samples/2_Concepts_and_Techniques/EGLStream_CUDA_Interop/NsightEclipse.xml
deleted file mode 100644
index 652a9430..00000000
--- a/Samples/2_Concepts_and_Techniques/EGLStream_CUDA_Interop/NsightEclipse.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-<!DOCTYPE entry SYSTEM "SamplesInfo.dtd">
-<entry>
-  <name>EGLStream_CUDA_Interop</name>
-  <cuda_api_list>
-    <driver>cuMemcpyDtoH</driver>
-    <driver>cuDeviceGetName</driver>
-    <driver>cuEGLStreamConsumerReleaseFrame</driver>
-    <driver>cuEGLStreamConsumerConnect</driver>
-    <driver>cuEGLStreamConsumerDisconnect</driver>
-    <driver>cuCtxPushCurrent</driver>
-    <driver>cuArrayDestroy</driver>
-    <driver>cuEGLStreamProducerReturnFrame</driver>
-    <driver>cuEGLStreamProducerPresentFrame</driver>
-    <driver>cuMemFree</driver>
-    <driver>cuGraphicsResourceGetMappedEglFrame</driver>
-    <driver>cuInit</driver>
-    <driver>cuEGLStreamConsumerAcquireFrame</driver>
-    <driver>cuEGLStreamProducerDisconnect</driver>
-    <driver>cuDeviceGetCount</driver>
-    <driver>cuEGLStreamProducerConnect</driver>
-    <driver>cuDeviceGetAttribute</driver>
-    <driver>cuCtxSynchronize</driver>
-    <driver>cuMemAlloc</driver>
-    <driver>cuCtxPopCurrent</driver>
-    <driver>cuCtxCreate</driver>
-    <driver>cuMemcpy</driver>
-    <toolkit>cudaProducerReadYUVFrame</toolkit>
-    <toolkit>cudaProducerTest</toolkit>
-    <toolkit>cudaProducerDeinit</toolkit>
-    <toolkit>cudaDeviceCreateProducer</toolkit>
-    <toolkit>cudaProducerReadARGBFrame</toolkit>
-    <toolkit>cudaDeviceCreateConsumer</toolkit>
-    <toolkit>cudaConsumerTest</toolkit>
-    <toolkit>cudaProducerInit</toolkit>
-  </cuda_api_list>
-  <description><![CDATA[Demonstrates data exchange between CUDA and EGL Streams.]]></description>
-  <devicecompilation>whole</devicecompilation>
-  <includepaths>
-    <path>./</path>
-    <path>../</path>
-    <path>../../../Common</path>
-  </includepaths>
-  <keyconcepts>
-    <concept level="basic">EGLStreams Interop</concept>
-  </keyconcepts>
-  <keywords>
-    <keyword>EGL Streams</keyword>
-  </keywords>
-  <libraries>
-    <library os="linux">cuda</library>
-    <library framework="true" os="macosx">CUDA</library>
-  </libraries>
-  <librarypaths>
-  </librarypaths>
-  <nsight_eclipse>true</nsight_eclipse>
-  <primary_file>main.cpp</primary_file>
-  <required_dependencies>
-    <dependency>EGL</dependency>
-  </required_dependencies>
-  <scopes>
-    <scope>1:CUDA Basic Topics</scope>
-    <scope>2:Graphics Interop</scope>
-  </scopes>
-  <sm-arch>sm50</sm-arch>
-  <sm-arch>sm52</sm-arch>
-  <sm-arch>sm53</sm-arch>
-  <sm-arch>sm60</sm-arch>
-  <sm-arch>sm61</sm-arch>
-  <sm-arch>sm70</sm-arch>
-  <sm-arch>sm72</sm-arch>
-  <sm-arch>sm75</sm-arch>
-  <sm-arch>sm80</sm-arch>
-  <sm-arch>sm86</sm-arch>
-  <sm-arch>sm87</sm-arch>
-  <sm-arch>sm89</sm-arch>
-  <sm-arch>sm90</sm-arch>
-  <supported_envs>
-    <env>
-      <arch>x86_64</arch>
-      <platform>linux</platform>
-    </env>
-    <env>
-      <arch>aarch64</arch>
-    </env>
-    <env>
-      <arch>sbsa</arch>
-    </env>
-  </supported_envs>
-  <supported_sm_architectures>
-    <include>all</include>
-  </supported_sm_architectures>
-  <title>EGLStream CUDA Interop</title>
-  <type>exe</type>
-</entry>
diff --git a/Samples/2_Concepts_and_Techniques/EGLStream_CUDA_Interop/findegl.mk b/Samples/2_Concepts_and_Techniques/EGLStream_CUDA_Interop/findegl.mk
deleted file mode 100644
index 33ec1a96..00000000
--- a/Samples/2_Concepts_and_Techniques/EGLStream_CUDA_Interop/findegl.mk
+++ /dev/null
@@ -1,151 +0,0 @@
-################################################################################
-# Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#  * Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#  * Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#  * Neither the name of NVIDIA CORPORATION nor the names of its
-#    contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-################################################################################
-#
-#  findegl.mk is used to find the necessary EGL Libraries for specific distributions
-#               this is supported on Linux
-#
-################################################################################
-
-# Determine OS platform and unix distribution
-ifeq ("$(TARGET_OS)","linux")
-   # first search lsb_release
-   DISTRO  = $(shell lsb_release -i -s 2>/dev/null | tr "[:upper:]" "[:lower:]")
-   ifeq ("$(DISTRO)","")
-     # second search and parse /etc/issue
-     DISTRO = $(shell more /etc/issue | awk '{print $$1}' | sed '1!d' | sed -e "/^$$/d" 2>/dev/null | tr "[:upper:]" "[:lower:]")
-     # ensure data from /etc/issue is valid
-     ifeq (,$(filter $(DISTRO),ubuntu fedora red rhel centos suse))
-       DISTRO = 
-     endif
-     ifeq ("$(DISTRO)","")
-       # third, we can search in /etc/os-release or /etc/{distro}-release
-       DISTRO = $(shell awk '/ID/' /etc/*-release | sed 's/ID=//' | grep -v "VERSION" | grep -v "ID" | grep -v "DISTRIB")
-     endif
-   endif
-endif
-
-ifeq ("$(TARGET_OS)","linux")
-    # $(info) >> findegl.mk -> LINUX path <<<)
-    # Each set of Linux Distros have different paths for where to find their OpenGL libraries reside
-    UBUNTU = $(shell echo $(DISTRO) | grep -i ubuntu      >/dev/null 2>&1; echo $$?)
-    FEDORA = $(shell echo $(DISTRO) | grep -i fedora      >/dev/null 2>&1; echo $$?)
-    RHEL   = $(shell echo $(DISTRO) | grep -i 'red\|rhel' >/dev/null 2>&1; echo $$?)
-    CENTOS = $(shell echo $(DISTRO) | grep -i centos      >/dev/null 2>&1; echo $$?)
-    SUSE   = $(shell echo $(DISTRO) | grep -i 'suse\|sles' >/dev/null 2>&1; echo $$?)
-    KYLIN  = $(shell echo $(DISTRO) | grep -i kylin        >/dev/null 2>&1; echo $$?)
-    ifeq ("$(UBUNTU)","0")
-      ifeq ($(HOST_ARCH)-$(TARGET_ARCH),x86_64-armv7l)
-        GLPATH := /usr/arm-linux-gnueabihf/lib
-        GLLINK := -L/usr/arm-linux-gnueabihf/lib
-        ifneq ($(TARGET_FS),) 
-          GLPATH += $(TARGET_FS)/usr/lib/arm-linux-gnueabihf
-          GLLINK += -L$(TARGET_FS)/usr/lib/arm-linux-gnueabihf
-        endif
-      else ifeq ($(HOST_ARCH)-$(TARGET_ARCH),x86_64-aarch64)
-        GLPATH := /usr/aarch64-linux-gnu/lib
-        GLLINK := -L/usr/aarch64-linux-gnu/lib
-        ifneq ($(TARGET_FS),)
-          GLPATH += $(TARGET_FS)/usr/lib
-          GLPATH += $(TARGET_FS)/usr/lib/aarch64-linux-gnu
-          GLLINK += -L$(TARGET_FS)/usr/lib/aarch64-linux-gnu
-        endif 
-      else
-        UBUNTU_PKG_NAME = $(shell which dpkg >/dev/null 2>&1 && dpkg -l 'nvidia-*' | grep '^ii' | awk '{print $$2}' | head -1)
-        ifneq ("$(UBUNTU_PKG_NAME)","")
-          GLPATH    ?= /usr/lib/$(UBUNTU_PKG_NAME)
-          GLLINK    ?= -L/usr/lib/$(UBUNTU_PKG_NAME)
-        endif
-
-        DFLT_PATH ?= /usr/lib
-      endif
-    endif
-	
-	ifeq ("$(SUSE)","0")
-      GLPATH    ?= /usr/X11R6/lib64
-      GLLINK    ?= -L/usr/X11R6/lib64
-      DFLT_PATH ?= /usr/lib64
-    else 
-      GLPATH    ?= /usr/lib64/nvidia
-      GLLINK    ?= -L/usr/lib64/nvidia
-      DFLT_PATH ?= /usr/lib64
-    endif
-
-  EGLLIB  := $(shell find -L $(GLPATH) $(DFLT_PATH) -name libEGL.so    -print 2>/dev/null)
-
-  ifeq ("$(EGLLIB)","")
-      $(info >>> WARNING - libEGL.so not found, please install libEGL.so <<<)
-      SAMPLE_ENABLED := 0
-  endif
-
-  HEADER_SEARCH_PATH ?= $(TARGET_FS)/usr/include
-  ifeq ($(HOST_ARCH)-$(TARGET_ARCH)-$(TARGET_OS),x86_64-armv7l-linux)
-      HEADER_SEARCH_PATH += /usr/arm-linux-gnueabihf/include
-  else ifeq ($(HOST_ARCH)-$(TARGET_ARCH)-$(TARGET_OS),x86_64-aarch64-linux)
-      HEADER_SEARCH_PATH += /usr/aarch64-linux-gnu/include
-  endif
-
-  EGLHEADER  := $(shell find -L $(HEADER_SEARCH_PATH) -name egl.h -print 2>/dev/null)
-  EGLEXTHEADER  := $(shell find -L $(HEADER_SEARCH_PATH) -name eglext.h -print 2>/dev/null)
-
-  ifeq ("$(EGLHEADER)","")
-      $(info >>> WARNING - egl.h not found, please install egl.h <<<)
-      SAMPLE_ENABLED := 0
-  endif
-  ifeq ("$(EGLEXTHEADER)","")
-      $(info >>> WARNING - eglext.h not found, please install eglext.h <<<)
-      SAMPLE_ENABLED := 0
-  endif
-else
-endif
-
-ifeq ("$(TARGET_OS)","qnx")
-    HOST_CCFLAGS := -V8.3.0,gcc_ntoaarch64le
-endif
-
-# Attempt to compile a minimal EGL application and run to check if EGL_SUPPORT_REUSE_NV is supported in the EGL headers available.
-ifneq ($(SAMPLE_ENABLED), 0)
-      $(shell printf "#include <EGL/egl.h>\n#include <EGL/eglext.h>\nint main() {\n#ifdef EGL_SUPPORT_REUSE_NV \n #error \"Compatible EGL header found\" \n  return 0;\n#endif \n return 1;\n}"  > test.c; )
-      EGL_DEFINES := $(shell $(HOST_COMPILER) $(HOST_CCFLAGS) $(CCFLAGS) $(EXTRA_CCFLAGS) -lEGL test.c -c 2>&1 | grep -ic "Compatible EGL header found";)
-      SHOULD_WAIVE := 0
-      ifeq ($(EGL_DEFINES),0)
-        SHOULD_WAIVE := 1
-      endif
-      ifeq ($(SHOULD_WAIVE),1)
-          $(info -----------------------------------------------------------------------------------------------)
-          $(info WARNING - NVIDIA EGL EXTENSIONS are not available in the present EGL headers)
-          $(info -----------------------------------------------------------------------------------------------)
-          $(info   This CUDA Sample cannot be built if the EGL NVIDIA EXTENSIONS like EGL_SUPPORT_REUSE_NV are not supported in EGL headers.)
-          $(info   This will be a dry-run of the Makefile.)
-          $(info   Please install the latest khronos EGL headers and libs to build this sample)
-          $(info -----------------------------------------------------------------------------------------------)
-          SAMPLE_ENABLED := 0
-      endif
-      $(shell rm test.o test.c 2>/dev/null)
-endif
-
diff --git a/Samples/2_Concepts_and_Techniques/EGLSync_CUDAEvent_Interop/CMakeLists.txt b/Samples/2_Concepts_and_Techniques/EGLSync_CUDAEvent_Interop/CMakeLists.txt
new file mode 100644
index 00000000..f6ece724
--- /dev/null
+++ b/Samples/2_Concepts_and_Techniques/EGLSync_CUDAEvent_Interop/CMakeLists.txt
@@ -0,0 +1,42 @@
+# Include directories and libraries
+include_directories(../../../Common)
+
+find_package(EGL)
+find_package(X11)
+find_package(OpenGL)
+
+# Source file
+set(SRC_FILES
+    EGLSync_CUDAEvent_Interop.cu
+)
+
+if(${OpenGL_FOUND})
+    if(${EGL_FOUND})
+        if(${X11_FOUND})
+            # Add target for EGLSync_CUDAEvent_Interop
+            add_executable(EGLSync_CUDAEvent_Interop ${SRC_FILES})
+            set_target_properties(EGLSync_CUDAEvent_Interop PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
+
+            target_include_directories(EGLSync_CUDAEvent_Interop PUBLIC
+                ${CUDAToolkit_INCLUDE_DIRS}
+                ${EGL_INCLUDE_DIR}
+                ${X11_INCLUDE_DIR}
+                ${OPENGL_INCLUDE_DIR}
+            )
+
+            target_link_libraries(EGLSync_CUDAEvent_Interop
+                CUDA::cuda_driver
+                #CUDA::cudart
+                ${EGL_LIBRARY}
+                ${X11_LIBRARIES}
+                ${OPENGL_LIBRARIES}
+            )
+        else()
+            message(STATUS "X11 libraries not found - will not build sample 'EGLSyncCUDAEvent_Interop'")
+        endif()
+    else()
+        message(STATUS "EGL not found - will not build sample 'EGLSync_CUDAEvent_Interop'")
+    endif()
+else()
+    message(STATUS "OpenGL not found - will not build sample 'EGLSync_CUDAEvent_Interop'")
+endif()
diff --git a/cmake/Modules/FindEGL.cmake b/cmake/Modules/FindEGL.cmake
new file mode 100644
index 00000000..b48b4af6
--- /dev/null
+++ b/cmake/Modules/FindEGL.cmake
@@ -0,0 +1,17 @@
+find_path(EGL_INCLUDE_DIR
+  NAMES EGL/egl.h
+  PATHS /usr/include /usr/local/include
+)
+
+find_library(EGL_LIBRARY
+  NAMES EGL
+  PATHS /usr/lib /usr/local/lib
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(EGL DEFAULT_MSG EGL_LIBRARY EGL_INCLUDE_DIR)
+
+if(EGL_FOUND)
+  set(EGL_LIBRARIES ${EGL_LIBRARY})
+  set(EGL_INCLUDE_DIRS ${EGL_INCLUDE_DIR})
+endif()