diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4566a7e..7c6e3c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,16 @@
 # Needs CUDAHOSTCXX=/usr/bin/cuda-g++;CUDA_LIB_PATH=/usr/local/cuda/lib64 in
-# CLion Settings | Build, Execution, Deployment | CMake > Environment
+# CLion Settings | Build, Execution, Deployment | CMake > Environment on fedora
+# and CUDAHOSTCXX=/usr/bin/g++-8 on pop_os
 
 cmake_minimum_required(VERSION 3.16)
-project(CudaSamples LANGUAGES CXX CUDA)
 
+project(CudaSamples LANGUAGES CXX CUDA)
+#set(ENV{MPI_HOME} /usr/local )
 set(CMAKE_CUDA_STANDARD 14)
 set(CMAKE_CUDA_FLAGS ${CMAKE_CUDA_FLAGS} "-arch=sm_75")
-include_directories(/usr/local/cuda/samples/common/inc)
+set(cuda_include_dirs = ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
+set(cuda_samples_include = "${cuda_include_dirs}/../../../samples/common/inc/")
+include_directories(${cuda_samples_include})
 
 set(CUDA_VERBOSE_BUILD ON)
 set(CUDA_SEPARABLE_COMPILATION ON) # Allow multiple CUDA files compilation
@@ -19,7 +23,9 @@ set_target_properties(
         CUDA_SEPARABLE_COMPILATION ON)
 
 add_executable(asyncAPI asyncAPI.cu)
-
+set(MPIEXEC_EXECUTABLE /opt/openmpi-cuda-4.0.3/bin/mpicxx)
+#set(MPI_CXX_COMPILER /usr/local/bin/mpicxx)
+#set(MPI_HOME /usr/local)
 find_package(MPI REQUIRED)
 include_directories(${MPI_CXX_INCLUDE_DIRS})