diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4791ca6..34c3bb1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,34 +1,36 @@
 # https://stackoverflow.com/questions/51907755/building-a-pybind11-module-with-cpp-and-cuda-sources-using-cmake
 
 cmake_minimum_required(VERSION 3.12)
-#set(CMAKE_CXX_COMPILER "/usr/local/gcc55/bin/g++55")
+
 project(gpuRIR LANGUAGES CXX CUDA)
 find_package(CUDA)
 
-set(PYBIND11_CPP_STANDARD -std=c++11)
-add_subdirectory(third_party/pybind11)
+# Select several CUDA architectures
+include(FindCUDA)
+cuda_select_nvcc_arch_flags(CUDA_ARCH_FLAGS Common) # Change Common by Auto for autodetect
+string(REPLACE ";" " " CUDA_ARCH_FLAGS "${CUDA_ARCH_FLAGS}")
+set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} ${CUDA_ARCH_FLAGS}")
+
+set(CMAKE_CUDA_FLAGS  "${CMAKE_CUDA_FLAGS} -D_FORCE_INLINES")
+# set(CMAKE_CUDA_FLAGS  "${CMAKE_CUDA_FLAGS} -lineinfo")
 
 add_library(gpuRIRcu STATIC
     src/gpuRIR_cuda.cu
 )
 
-SET(CMAKE_CUDA_FLAGS  "${CMAKE_CUDA_FLAGS} -D_FORCE_INLINES")
-# SET(CMAKE_CUDA_FLAGS  "${CMAKE_CUDA_FLAGS} -lineinfo")
-
-#target_link_libraries(gpuRIRcu PRIVATE -lcurand)
-
 set_target_properties(gpuRIRcu PROPERTIES 
     POSITION_INDEPENDENT_CODE ON
     CUDA_VISIBILITY_PRESET "hidden"
     # CUDA_SEPARABLE_COMPILATION ON
 )
 
-target_compile_options(gpuRIRcu PRIVATE $<$<COMPILE_LANGUAGE:CUDA>:-gencode arch=compute_60,code=sm_60>)
-
 add_library(gpuRIR_bind MODULE
     src/python_bind.cpp
 )
 
+set(PYBIND11_CPP_STANDARD -std=c++11)
+add_subdirectory(third_party/pybind11)
+
 set_target_properties(gpuRIR_bind PROPERTIES 
     CXX_VISIBILITY_PRESET "hidden"
     PREFIX "${PYTHON_MODULE_PREFIX}"