From 73220d2bb044e5f01b3eee4838c5b32ca679f027 Mon Sep 17 00:00:00 2001
From: Eugene Brevdo <ebrevdo@gmail.com>
Date: Tue, 8 Mar 2016 17:28:21 -0800
Subject: Resolve bad merge.

---
 cmake/EigenTesting.cmake | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'cmake/EigenTesting.cmake')

diff --git a/cmake/EigenTesting.cmake b/cmake/EigenTesting.cmake
index 5022397a7..5ca800cfe 100644
--- a/cmake/EigenTesting.cmake
+++ b/cmake/EigenTesting.cmake
@@ -19,12 +19,15 @@ macro(ei_add_test_internal testname testname_with_suffix)
   endif()
   
   if(EIGEN_ADD_TEST_FILENAME_EXTENSION STREQUAL cu)
-    cuda_add_executable(${targetname} ${filename})
+    if (${ARGC} GREATER 2)
+      cuda_add_executable(${targetname} ${filename} OPTIONS ${ARGV2})
+    else()
+      cuda_add_executable(${targetname} ${filename})
+    endif()
   else()
     add_executable(${targetname} ${filename})
   endif()
   
-  
   if (targetname MATCHES "^eigen2_")
     add_dependencies(eigen2_buildtests ${targetname})
   else()
-- 
cgit v1.2.3