From 9c132da5ee8233711c8ec0ba690e6f4572c6ffd3 Mon Sep 17 00:00:00 2001
From: "Raul P. Pelaez" <raul.perez@uam.es>
Date: Mon, 7 Dec 2020 14:16:46 +0100
Subject: [PATCH] Update CMakeLists.txt to be compatible with latest cuda
 versions

---
 CMakeLists.txt           | 17 ++++++++++++-----
 src/NeighbourListGPU.cuh |  2 +-
 src/ParticleSorter.cuh   |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 731b230..f3b8647 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,13 +24,20 @@ if(NOT DONT_USE_CUDA)
   if(CMAKE_CUDA_COMPILER)
     enable_language(CUDA)
     set(USE_CUDA ON)
-    
-    set(CMAKE_CUDA_STANDARD 11)
+
+    if(CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 11)
+    set(CMAKE_CUDA_STANDARD 14)
+    set(CMAKE_CXX_STANDARD 14)
+    else()
+      include_directories(src/third_party)
+      set(CMAKE_CXX_STANDARD 11)
+      set(CMAKE_CUDA_STANDARD 11)
+    endif()
     set(CMAKE_CUDA_STANDARD_REQUIRED ON)
     set(CMAKE_CUDA_SEPARABLE_COMPILATION OFF)
     
-    execute_process(COMMAND bash  ${PROJECT_SOURCE_DIR}/cmake/listArchs.sh OUTPUT_VARIABLE ARCHS)
-    set(CMAKE_CUDA_FLAGS ${ARCHS} ${CMAKE_CUDA_FLAGS}) 
+    #execute_process(COMMAND bash  ${PROJECT_SOURCE_DIR}/cmake/listArchs.sh OUTPUT_VARIABLE ARCHS)
+    #set(CMAKE_CUDA_FLAGS ${ARCHS} ${CMAKE_CUDA_FLAGS}) 
   endif()
 endif()
 
@@ -44,6 +51,6 @@ endif()
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
-include_directories(src/third_party)
+
 add_subdirectory(src)
 
diff --git a/src/NeighbourListGPU.cuh b/src/NeighbourListGPU.cuh
index 899f39a..8e56423 100644
--- a/src/NeighbourListGPU.cuh
+++ b/src/NeighbourListGPU.cuh
@@ -11,7 +11,7 @@
 #include"ParticleSorter.cuh"
 #include<thrust/device_vector.h>
 #include<thrust/host_vector.h>
-#include"third_party/cub/cub.cuh"
+#include"cub/cub.cuh"
 
 #include<limits>
 
diff --git a/src/ParticleSorter.cuh b/src/ParticleSorter.cuh
index b4f1943..6933483 100644
--- a/src/ParticleSorter.cuh
+++ b/src/ParticleSorter.cuh
@@ -33,7 +33,7 @@ REFERENCES:
 #include"utils.cuh"
 #include<thrust/device_vector.h>
 #include<thrust/host_vector.h>
-#include"third_party/cub/cub.cuh"
+#include"cub/cub.cuh"
 
 namespace gdr{