Fix test_kernel.cpp

Also minor fixes for CMake scripts.

Author: jszuppe

test/CMakeLists.txt

@@ -46,7 +46,7 @@ endif()
 add_definitions(-DBOOST_COMPUTE_DEBUG_KERNEL_COMPILATION)
 
 # enable code coverage generation (only with GCC for now)
-if(${BOOST_COMPUTE_ENABLE_COVERAGE} AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+if(${BOOST_COMPUTE_ENABLE_COVERAGE} AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
   add_definitions(-fprofile-arcs -ftest-coverage)
 endif()
 
@@ -62,7 +62,7 @@ function(add_compute_test TEST_NAME TEST_SOURCE)
   )
 
   # link with coverage library
-  if(${BOOST_COMPUTE_ENABLE_COVERAGE} AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+  if(${BOOST_COMPUTE_ENABLE_COVERAGE} AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
     target_link_libraries(${TEST_TARGET} -fprofile-arcs -ftest-coverage)
   endif()
 

test/extra/CMakeLists.txt

@@ -1,6 +1,6 @@
 # ---------------------------------------------------------------------------
 #  Copyright (c) 2015 Kyle Lutz <[email protected]>
-# 
+#
 #  Distributed under the Boost Software License, Version 1.0
 #  See accompanying file LICENSE_1_0.txt or copy at
 #  http://www.boost.org/LICENSE_1_0.txt
@@ -20,7 +20,7 @@ target_link_libraries(test_multiple_objects
     ${Boost_LIBRARIES}
     )
 # link with coverage library
-if(${BOOST_COMPUTE_ENABLE_COVERAGE} AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+if(${BOOST_COMPUTE_ENABLE_COVERAGE} AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
   target_link_libraries(test_multiple_objects -fprofile-arcs -ftest-coverage)
 endif()
 add_test("misc.multiple_objects" test_multiple_objects)

test/test_kernel.cpp

@@ -177,11 +177,14 @@ BOOST_AUTO_TEST_CASE(get_sub_group_info_ext)
         local_work_size
     );
 
+    #ifdef BOOST_COMPUTE_CL_VERSION_2_1
     if(device.check_version(2, 1))
     {
         BOOST_CHECK(count);
     }
-    else if(device.check_version(2, 0) && device.supports_extension("cl_khr_subgroups"))
+    else
+    #endif // BOOST_COMPUTE_CL_VERSION_2_1
+    if(device.check_version(2, 0) && device.supports_extension("cl_khr_subgroups"))
     {
         // for device with cl_khr_subgroups it should return some value
         BOOST_CHECK(count);
@@ -200,11 +203,14 @@ BOOST_AUTO_TEST_CASE(get_sub_group_info_ext)
         &local_work_size[0]
     );
 
+    #ifdef BOOST_COMPUTE_CL_VERSION_2_1
     if(device.check_version(2, 1))
     {
         BOOST_CHECK(count);
     }
-    else if(device.check_version(2, 0) && device.supports_extension("cl_khr_subgroups"))
+    else
+    #endif // BOOST_COMPUTE_CL_VERSION_2_1
+    if(device.check_version(2, 0) && device.supports_extension("cl_khr_subgroups"))
     {
         // for device with cl_khr_subgroups it should return some value
         BOOST_CHECK(count);