Pass CUDA_ARCH_LIST to CMake only for CUDA build

This avoids a cmake warning in other builds.

diff --git a/.travis.yml b/.travis.yml
index d0bbc57ef9ecaf2e24727223f005fd76cb7ec8a4..0f6ef1f058f00a445cad870bea2060f3f3eaa221 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ addons:
       - cuda-command-line-tools-8-0 cuda-cufft-dev-8-0
 
 env:
-  - CUDA_BIN_PATH=/usr/local/cuda-8.0 CXXFLAGS=-Werror CMAKE_OPTS=-DCUDA_ARCH_LIST=6.2
+  - CUDA_BIN_PATH=/usr/local/cuda-8.0 CXXFLAGS=-Werror CUDA_ARCH_LIST=6.2
 
 script: make
 

diff --git a/Makefile b/Makefile
index 9fa2ec6878aba1e4424d50bce1046ee99793af5d..401008ff35fd32cfcb0303f6705b736072da2a26 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,7 @@ CMAKE_OPTS += -G Ninja
 # export CC=gcc-5
 # export CXX=g++-5
 # export CUDA_BIN_PATH=/usr/local/cuda-9.0
+# export CUDA_ARCH_LIST=6.2
 
 CMAKE_OTPS_opencvfft-st      = -DFFT=OpenCV
 CMAKE_OTPS_opencvfft-async   = -DFFT=OpenCV -DASYNC=ON
@@ -23,13 +24,13 @@ CMAKE_OTPS_fftw-openmp       = -DFFT=fftw -DOPENMP=ON
 CMAKE_OTPS_fftw-async        = -DFFT=fftw -DASYNC=ON
 CMAKE_OTPS_fftw-big          = -DFFT=fftw -DBIG_BATCH=ON
 CMAKE_OTPS_fftw-big-openmp   = -DFFT=fftw -DBIG_BATCH=ON -DOPENMP=ON
-CMAKE_OTPS_cufftw            = -DFFT=cuFFTW
-CMAKE_OTPS_cufftw-big        = -DFFT=cuFFTW -DBIG_BATCH=ON
-CMAKE_OTPS_cufftw-big-openmp = -DFFT=cuFFTW -DBIG_BATCH=ON -DOPENMP=ON
-CMAKE_OTPS_cufft             = -DFFT=cuFFT
-CMAKE_OTPS_cufft-openmp             = -DFFT=cuFFT -DOPENMP=ON
-CMAKE_OTPS_cufft-big         = -DFFT=cuFFT -DBIG_BATCH=ON
-CMAKE_OTPS_cufft-big-openmp  = -DFFT=cuFFT -DBIG_BATCH=ON -DOPENMP=ON
+CMAKE_OTPS_cufftw            = -DFFT=cuFFTW $(if $(CUDA_ARCH_LIST),-DCUDA_ARCH_LIST='$(CUDA_ARCH_LIST)')
+CMAKE_OTPS_cufftw-big        = -DFFT=cuFFTW $(if $(CUDA_ARCH_LIST),-DCUDA_ARCH_LIST='$(CUDA_ARCH_LIST)') -DBIG_BATCH=ON
+CMAKE_OTPS_cufftw-big-openmp = -DFFT=cuFFTW $(if $(CUDA_ARCH_LIST),-DCUDA_ARCH_LIST='$(CUDA_ARCH_LIST)') -DBIG_BATCH=ON -DOPENMP=ON
+CMAKE_OTPS_cufft             = -DFFT=cuFFT  $(if $(CUDA_ARCH_LIST),-DCUDA_ARCH_LIST='$(CUDA_ARCH_LIST)')
+CMAKE_OTPS_cufft-openmp             = -DFFT=cuFFT  $(if $(CUDA_ARCH_LIST),-DCUDA_ARCH_LIST='$(CUDA_ARCH_LIST)') -DOPENMP=ON
+CMAKE_OTPS_cufft-big         = -DFFT=cuFFT  $(if $(CUDA_ARCH_LIST),-DCUDA_ARCH_LIST='$(CUDA_ARCH_LIST)') -DBIG_BATCH=ON
+CMAKE_OTPS_cufft-big-openmp  = -DFFT=cuFFT  $(if $(CUDA_ARCH_LIST),-DCUDA_ARCH_LIST='$(CUDA_ARCH_LIST)') -DBIG_BATCH=ON -DOPENMP=ON
 
 .SECONDARY: $(BUILDS:%=build-%/build.ninja)