Add OpenCLCTS target and install component to CMake

test_conformance/CMakeLists.txt

@@ -26,6 +26,8 @@ else()
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CTS_EXTRA_FLAGS}")
 endif()
 
+add_custom_target(OpenCLCTS)
+
 add_subdirectory(allocations)
 add_subdirectory(api)
 add_subdirectory(atomics)

test_conformance/allocations/CMakeLists.txt

@@ -29,5 +29,7 @@ set_source_files_properties(
 TARGET_LINK_LIBRARIES(conformance_test_allocations
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_allocations)
 install(TARGETS conformance_test_allocations
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/api/CMakeLists.txt

@@ -65,5 +65,7 @@ set_source_files_properties(
 TARGET_LINK_LIBRARIES(conformance_test_api
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_api)
 install(TARGETS conformance_test_api
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/atomics/CMakeLists.txt

@@ -27,5 +27,7 @@ set_source_files_properties(
 TARGET_LINK_LIBRARIES(conformance_test_atomics
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_atomics)
 install(TARGETS conformance_test_atomics
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/basic/CMakeLists.txt

@@ -120,5 +120,7 @@ set_source_files_properties(
 TARGET_LINK_LIBRARIES(conformance_test_basic
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_basic)
 install(TARGETS conformance_test_basic
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/buffers/CMakeLists.txt

@@ -30,5 +30,7 @@ set_source_files_properties(
 TARGET_LINK_LIBRARIES(conformance_test_buffers
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_buffers)
 install(TARGETS conformance_test_buffers
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/commonfns/CMakeLists.txt

@@ -31,5 +31,7 @@ set_source_files_properties(
 TARGET_LINK_LIBRARIES(conformance_test_commonfns
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_commonfns)
 install(TARGETS conformance_test_commonfns
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/compiler/CMakeLists.txt

@@ -48,11 +48,15 @@ add_custom_command(TARGET conformance_test_compiler POST_BUILD
 		"${CMAKE_CURRENT_SOURCE_DIR}/secondIncludeTestDirectory"
 		"$<TARGET_FILE_DIR:conformance_test_compiler>/secondIncludeTestDirectory")
 
+add_dependencies(OpenCLCTS conformance_test_compiler)
 install(TARGETS conformance_test_compiler
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/includeTestDirectory
-		DESTINATION "${CLConf_OUT_DIR}")
+		DESTINATION "${CLConf_OUT_DIR}"
+		COMPONENT OpenCLCTS)
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/secondIncludeTestDirectory
-		DESTINATION "${CLConf_OUT_DIR}")
+		DESTINATION "${CLConf_OUT_DIR}"
+		COMPONENT OpenCLCTS)

test_conformance/computeinfo/CMakeLists.txt

@@ -13,5 +13,7 @@ set_source_files_properties(
 TARGET_LINK_LIBRARIES(conformance_test_computeinfo
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_computeinfo)
 install(TARGETS conformance_test_computeinfo
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/contractions/CMakeLists.txt

@@ -30,5 +30,7 @@ endif(WIN32)
 TARGET_LINK_LIBRARIES(conformance_test_contractions
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_contractions)
 install(TARGETS conformance_test_contractions
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/conversions/CMakeLists.txt

@@ -64,5 +64,7 @@ endif()
 TARGET_LINK_LIBRARIES(conformance_test_conversions
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_conversions)
 install(TARGETS conformance_test_conversions
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/d3d10/CMakeLists.txt

@@ -43,4 +43,9 @@ set_source_files_properties(
 TARGET_LINK_LIBRARIES(conformance_test_d3d10
     ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_d3d10)
+install(TARGETS conformance_test_d3d10
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)
+
 endif(WIN32)

test_conformance/d3d11/CMakeLists.txt

@@ -43,4 +43,9 @@ set_source_files_properties(
 TARGET_LINK_LIBRARIES(conformance_test_d3d11
     ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_d3d11)
+install(TARGETS conformance_test_d3d11
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)
+
 endif(WIN32)

test_conformance/device_partition/CMakeLists.txt

@@ -29,5 +29,7 @@ set_source_files_properties(
 target_link_libraries(conformance_test_device_partition
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_device_partition)
 install(TARGETS conformance_test_device_partition
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/events/CMakeLists.txt

@@ -43,5 +43,7 @@ set_source_files_properties(
 TARGET_LINK_LIBRARIES(conformance_test_events
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_events)
 install(TARGETS conformance_test_events
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/geometrics/CMakeLists.txt

@@ -30,5 +30,7 @@ set_source_files_properties(
 TARGET_LINK_LIBRARIES(conformance_test_geometrics
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_geometrics)
 install(TARGETS conformance_test_geometrics
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/gl/CMakeLists.txt

@@ -65,3 +65,8 @@ set_source_files_properties(
         
 TARGET_LINK_LIBRARIES(conformance_test_gl
         ${CLConform_LIBRARIES})
+
+add_dependencies(OpenCLCTS conformance_test_gl)
+install(TARGETS conformance_test_gl
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/half/CMakeLists.txt

@@ -17,5 +17,7 @@ endif(MSVC)
 TARGET_LINK_LIBRARIES(conformance_test_half
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_half)
 install(TARGETS conformance_test_half
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/headers/CMakeLists.txt

@@ -68,9 +68,15 @@ TARGET_LINK_LIBRARIES(conformance_test_cl_gl_h_c99
 TARGET_LINK_LIBRARIES(conformance_test_opencl_h_c99
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_headers conformance_test_cl_h
+    conformance_test_cl_platform_h conformance_test_cl_gl_h
+    conformance_test_opencl_h conformance_test_cl_h_c99
+    conformance_test_cl_platform_h_c99 conformance_test_cl_gl_h_c99
+    conformance_test_opencl_h_c99)
 install(TARGETS conformance_test_headers conformance_test_cl_h
     conformance_test_cl_platform_h conformance_test_cl_gl_h
     conformance_test_opencl_h conformance_test_cl_h_c99
     conformance_test_cl_platform_h_c99 conformance_test_cl_gl_h_c99
     conformance_test_opencl_h_c99
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/images/clCopyImage/CMakeLists.txt

@@ -48,5 +48,7 @@ set_source_files_properties(
 TARGET_LINK_LIBRARIES(conformance_test_cl_copy_images
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_cl_copy_images)
 install(TARGETS conformance_test_cl_copy_images
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/images/clFillImage/CMakeLists.txt

@@ -42,5 +42,7 @@ set_source_files_properties(
 TARGET_LINK_LIBRARIES(conformance_test_cl_fill_images
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_cl_fill_images)
 install(TARGETS conformance_test_cl_fill_images
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/images/clGetInfo/CMakeLists.txt

@@ -39,5 +39,7 @@ set_source_files_properties(
 TARGET_LINK_LIBRARIES(conformance_test_cl_get_info
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_cl_get_info)
 install(TARGETS conformance_test_cl_get_info
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/images/clReadWriteImage/CMakeLists.txt

@@ -41,5 +41,7 @@ set_source_files_properties(
 TARGET_LINK_LIBRARIES(conformance_test_cl_read_write_images
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_cl_read_write_images)
 install(TARGETS conformance_test_cl_read_write_images
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/images/kernel_image_methods/CMakeLists.txt

@@ -41,5 +41,7 @@ set_source_files_properties(
 TARGET_LINK_LIBRARIES(conformance_test_kernel_image_methods
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_kernel_image_methods)
 install(TARGETS conformance_test_kernel_image_methods
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/images/kernel_read_write/CMakeLists.txt

@@ -51,5 +51,7 @@ set_source_files_properties(
 TARGET_LINK_LIBRARIES(conformance_test_image_streams
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_image_streams)
 install(TARGETS conformance_test_image_streams
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/images/samplerlessReads/CMakeLists.txt

@@ -43,5 +43,7 @@ set_source_files_properties(
 TARGET_LINK_LIBRARIES(conformance_test_samplerless_reads
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_samplerless_reads)
 install(TARGETS conformance_test_samplerless_reads
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/integer_ops/CMakeLists.txt

@@ -67,5 +67,7 @@ endif (NOT CMAKE_CL_64 AND NOT MSVC)
 TARGET_LINK_LIBRARIES(conformance_test_integer_ops
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_integer_ops)
 install(TARGETS conformance_test_integer_ops
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/math_brute_force/CMakeLists.txt

@@ -72,5 +72,7 @@ endif(NOT CMAKE_CL_64 AND NOT MSVC)
 TARGET_LINK_LIBRARIES(conformance_test_bruteforce
     ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_bruteforce)
 install(TARGETS conformance_test_bruteforce
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/mem_host_flags/CMakeLists.txt

@@ -33,5 +33,7 @@ set_source_files_properties(
 target_link_libraries(conformance_test_mem_host_flags
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_mem_host_flags)
 install(TARGETS conformance_test_mem_host_flags
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/multiple_device_context/CMakeLists.txt

@@ -32,5 +32,7 @@ set_source_files_properties(
 TARGET_LINK_LIBRARIES(conformance_test_multiples
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_multiples)
 install(TARGETS conformance_test_multiples
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/printf/CMakeLists.txt

@@ -19,5 +19,7 @@ set_source_files_properties(
 target_link_libraries(conformance_test_printf
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_printf)
 install(TARGETS conformance_test_printf
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/profiling/CMakeLists.txt

@@ -29,5 +29,7 @@ set_source_files_properties(
 TARGET_LINK_LIBRARIES(conformance_test_profiling
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_profiling)
 install(TARGETS conformance_test_profiling
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/relationals/CMakeLists.txt

@@ -35,5 +35,7 @@ set_source_files_properties(
 TARGET_LINK_LIBRARIES(conformance_test_relationals
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_relationals)
 install(TARGETS conformance_test_relationals
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/select/CMakeLists.txt

@@ -25,5 +25,7 @@ endif(WIN32)
 TARGET_LINK_LIBRARIES(conformance_test_select
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_select)
 install(TARGETS conformance_test_select
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/spir/CMakeLists.txt

@@ -1,5 +1,6 @@
 function (install_spir_artifacts suite_name)
-  install(FILES "${suite_name}.zip" DESTINATION "${CLConf_OUT_DIR}")
+  install(FILES "${suite_name}.zip" DESTINATION "${CLConf_OUT_DIR}"
+          COMPONENT OpenCLCTS)
 endfunction()
 
 add_executable(
@@ -60,8 +61,10 @@ add_custom_command(TARGET conformance_test_spir POST_BUILD
 	COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/vec_step.zip" "$<TARGET_FILE_DIR:conformance_test_spir>/vec_step.zip"
 	COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/binary_type.zip" "$<TARGET_FILE_DIR:conformance_test_spir>/binary_type.zip")
 
+add_dependencies(OpenCLCTS conformance_test_spir)
 install(TARGETS conformance_test_spir
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)
 
 install_spir_artifacts(api)
 install_spir_artifacts(atomics)
@@ -86,6 +89,6 @@ install_spir_artifacts(sampler_enumeration)
 install_spir_artifacts(vec_align)
 install_spir_artifacts(vec_step)
 install_spir_artifacts(binary_type)
-install(FILES "khr.csv" DESTINATION "${CLConf_OUT_DIR}")
+install(FILES "khr.csv" DESTINATION "${CLConf_OUT_DIR}" COMPONENT OpenCLCTS)
 #Add any other runtime directories you need here.
 # end of file #

test_conformance/thread_dimensions/CMakeLists.txt

@@ -30,5 +30,7 @@ set_source_files_properties(
 TARGET_LINK_LIBRARIES(conformance_test_thread_dimensions
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_thread_dimensions)
 install(TARGETS conformance_test_thread_dimensions
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/vec_align/CMakeLists.txt

@@ -33,5 +33,7 @@ set_source_files_properties(
 TARGET_LINK_LIBRARIES(conformance_test_vecalign
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_vecalign)
 install(TARGETS conformance_test_vecalign
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)

test_conformance/vec_step/CMakeLists.txt

@@ -31,5 +31,7 @@ set_source_files_properties(
 TARGET_LINK_LIBRARIES(conformance_test_vecstep
         ${CLConform_LIBRARIES})
 
+add_dependencies(OpenCLCTS conformance_test_vecstep)
 install(TARGETS conformance_test_vecstep
-    DESTINATION "${CLConf_OUT_DIR}")
+    DESTINATION "${CLConf_OUT_DIR}"
+    COMPONENT OpenCLCTS)