Made it possible to use the command-line environmental variables for each executable and without re-running CMake

1 files changed, 3 insertions, 20 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 246d006c..e5feab03 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -237,23 +237,6 @@ endif()
 
 # ==================================================================================================
 
-# Sets a default platform ($CLBLAST_PLATFORM) and device ($CLBLAST_DEVICE) to run tuners and tests
-set(DEVICEPLATFORM )
-if(DEFINED ENV{CLBLAST_DEVICE})
-  set(DEVICEPLATFORM ${DEVICEPLATFORM} -device $ENV{CLBLAST_DEVICE})
-endif()
-if(DEFINED ENV{CLBLAST_PLATFORM})
-  set(DEVICEPLATFORM ${DEVICEPLATFORM} -platform $ENV{CLBLAST_PLATFORM})
-endif()
-
-# Optionally also provides other options to the tests such as -full_test ($CLBLAST_TEST_ARGUMENTS)
-set(TEST_ARGUMENTS )
-if(DEFINED ENV{CLBLAST_TEST_ARGUMENTS})
-  set(TEST_ARGUMENTS $ENV{CLBLAST_TEST_ARGUMENTS})
-endif()
-
-# ==================================================================================================
-
 # This section contains all the code related to the examples
 if(SAMPLES)
 
@@ -301,7 +284,7 @@ if(TUNERS)
   set(ALLTUNERSDEPENDS )
   foreach(KERNEL ${KERNELS})
     foreach(PRECISION ${PRECISIONS})
-      set(ALLTUNERS ${ALLTUNERS} COMMAND clblast_tuner_${KERNEL} -precision ${PRECISION} ${DEVICEPLATFORM})
+      set(ALLTUNERS ${ALLTUNERS} COMMAND clblast_tuner_${KERNEL} -precision ${PRECISION})
     endforeach()
     set(ALLTUNERSDEPENDS clblast_tuner_${KERNEL})
   endforeach()
@@ -428,14 +411,14 @@ if(TESTS)
     target_link_libraries(clblast_test_${ROUTINE} clblast ${REF_LIBRARIES} ${OPENCL_LIBRARIES})
     install(TARGETS clblast_test_${ROUTINE} DESTINATION bin)
     target_include_directories(clblast_test_${ROUTINE} PUBLIC ${clblast_SOURCE_DIR} ${REF_INCLUDES})
-    add_test(clblast_test_${ROUTINE} clblast_test_${ROUTINE} ${DEVICEPLATFORM} ${TEST_ARGUMENTS})
+    add_test(clblast_test_${ROUTINE} clblast_test_${ROUTINE})
   endforeach()
 
   # Adds 'alltests' target: runs all tests
   set(ALLTESTS )
   set(ALLTESTSDEPENDS )
   foreach(ROUTINE ${ROUTINES})
-    set(ALLTESTS ${ALLTESTS} COMMAND clblast_test_${ROUTINE} ${DEVICEPLATFORM} ${TEST_ARGUMENTS})
+    set(ALLTESTS ${ALLTESTS} COMMAND clblast_test_${ROUTINE})
     set(ALLTESTSDEPENDS clblast_test_${ROUTINE})
   endforeach()
   add_custom_target(alltests ${ALLTESTS} DEPENDS ${ALLTESTSDEPENDS})