From b67a5f37617edb2adf314df6f0f0eed83f499859 Mon Sep 17 00:00:00 2001 From: Alastair Murray Date: Fri, 2 Mar 2018 18:32:39 +0000 Subject: [PATCH] Add OpenCLCTS target and install component to CMake --- test_conformance/CMakeLists.txt | 2 + test_conformance/allocations/CMakeLists.txt | 4 +- test_conformance/api/CMakeLists.txt | 4 +- test_conformance/atomics/CMakeLists.txt | 4 +- test_conformance/basic/CMakeLists.txt | 4 +- test_conformance/buffers/CMakeLists.txt | 4 +- test_conformance/commonfns/CMakeLists.txt | 4 +- test_conformance/compiler/CMakeLists.txt | 10 +- test_conformance/computeinfo/CMakeLists.txt | 4 +- test_conformance/contractions/CMakeLists.txt | 4 +- test_conformance/conversions/CMakeLists.txt | 4 +- test_conformance/d3d10/CMakeLists.txt | 97 ++++++++++--------- test_conformance/d3d11/CMakeLists.txt | 97 ++++++++++--------- .../device_partition/CMakeLists.txt | 4 +- test_conformance/events/CMakeLists.txt | 4 +- test_conformance/geometrics/CMakeLists.txt | 4 +- test_conformance/gl/CMakeLists.txt | 5 + test_conformance/half/CMakeLists.txt | 4 +- test_conformance/headers/CMakeLists.txt | 8 +- .../images/clCopyImage/CMakeLists.txt | 4 +- .../images/clFillImage/CMakeLists.txt | 4 +- .../images/clGetInfo/CMakeLists.txt | 4 +- .../images/clReadWriteImage/CMakeLists.txt | 4 +- .../kernel_image_methods/CMakeLists.txt | 4 +- .../images/kernel_read_write/CMakeLists.txt | 4 +- .../images/samplerlessReads/CMakeLists.txt | 4 +- test_conformance/integer_ops/CMakeLists.txt | 4 +- .../math_brute_force/CMakeLists.txt | 4 +- .../mem_host_flags/CMakeLists.txt | 4 +- .../multiple_device_context/CMakeLists.txt | 4 +- test_conformance/printf/CMakeLists.txt | 4 +- test_conformance/profiling/CMakeLists.txt | 4 +- test_conformance/relationals/CMakeLists.txt | 4 +- test_conformance/select/CMakeLists.txt | 4 +- test_conformance/spir/CMakeLists.txt | 9 +- .../thread_dimensions/CMakeLists.txt | 4 +- test_conformance/vec_align/CMakeLists.txt | 4 +- test_conformance/vec_step/CMakeLists.txt | 4 +- 38 files changed, 222 insertions(+), 130 deletions(-) diff --git a/test_conformance/CMakeLists.txt b/test_conformance/CMakeLists.txt index 57ebea08..a3b39fe3 100644 --- a/test_conformance/CMakeLists.txt +++ b/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) diff --git a/test_conformance/allocations/CMakeLists.txt b/test_conformance/allocations/CMakeLists.txt index e36ad87d..c5faa4d1 100644 --- a/test_conformance/allocations/CMakeLists.txt +++ b/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) diff --git a/test_conformance/api/CMakeLists.txt b/test_conformance/api/CMakeLists.txt index e3eabb0a..e461bce2 100644 --- a/test_conformance/api/CMakeLists.txt +++ b/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) diff --git a/test_conformance/atomics/CMakeLists.txt b/test_conformance/atomics/CMakeLists.txt index 8c8146fc..fbb3162e 100644 --- a/test_conformance/atomics/CMakeLists.txt +++ b/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) diff --git a/test_conformance/basic/CMakeLists.txt b/test_conformance/basic/CMakeLists.txt index e1171f5f..25407c49 100644 --- a/test_conformance/basic/CMakeLists.txt +++ b/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) diff --git a/test_conformance/buffers/CMakeLists.txt b/test_conformance/buffers/CMakeLists.txt index 4f7fb3a7..02466a0b 100644 --- a/test_conformance/buffers/CMakeLists.txt +++ b/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) diff --git a/test_conformance/commonfns/CMakeLists.txt b/test_conformance/commonfns/CMakeLists.txt index 0c44159f..98cd986d 100644 --- a/test_conformance/commonfns/CMakeLists.txt +++ b/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) diff --git a/test_conformance/compiler/CMakeLists.txt b/test_conformance/compiler/CMakeLists.txt index 8d0b06ef..f2abfefe 100644 --- a/test_conformance/compiler/CMakeLists.txt +++ b/test_conformance/compiler/CMakeLists.txt @@ -48,11 +48,15 @@ add_custom_command(TARGET conformance_test_compiler POST_BUILD "${CMAKE_CURRENT_SOURCE_DIR}/secondIncludeTestDirectory" "$/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) diff --git a/test_conformance/computeinfo/CMakeLists.txt b/test_conformance/computeinfo/CMakeLists.txt index 2f7307bd..3362ee17 100644 --- a/test_conformance/computeinfo/CMakeLists.txt +++ b/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) diff --git a/test_conformance/contractions/CMakeLists.txt b/test_conformance/contractions/CMakeLists.txt index e7a57fce..5e8224c5 100644 --- a/test_conformance/contractions/CMakeLists.txt +++ b/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) diff --git a/test_conformance/conversions/CMakeLists.txt b/test_conformance/conversions/CMakeLists.txt index 407d6391..49690626 100644 --- a/test_conformance/conversions/CMakeLists.txt +++ b/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) diff --git a/test_conformance/d3d10/CMakeLists.txt b/test_conformance/d3d10/CMakeLists.txt index d6c163d7..3949d740 100644 --- a/test_conformance/d3d10/CMakeLists.txt +++ b/test_conformance/d3d10/CMakeLists.txt @@ -1,46 +1,51 @@ -if(WIN32) - -set(D3D10_INCLUDE_DIR $ENV{NV_TOOLS}/sdk/DirectX_Aug2009/Include) - -if(${ARCH} STREQUAL "i686") -set(D3D10_LIB_DIR $ENV{NV_TOOLS}/sdk/DirectX_Aug2009/Lib/x86) -endif(${ARCH} STREQUAL "i686") - -if(${ARCH} STREQUAL "x86_64") -set(D3D10_LIB_DIR $ENV{NV_TOOLS}/sdk/DirectX_Aug2009/Lib/x64) -endif(${ARCH} STREQUAL "x86_64") - -list(APPEND CLConform_INCLUDE_DIR ${D3D10_INCLUDE_DIR}) -include_directories (${CLConform_SOURCE_DIR}/test_common/harness - ${CLConform_INCLUDE_DIR} ) -link_directories(${CL_LIB_DIR}, ${D3D10_LIB_DIR}) - -list(APPEND CLConform_LIBRARIES d3d10 dxgi) - - -set(D3D10_SOURCES - buffer.cpp - texture2d.cpp - texture3d.cpp - misc.cpp - main.cpp - harness.cpp - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/threadTesting.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/mt19937.c - ../../test_common/harness/conversions.c - ../../test_common/harness/msvc9.c) - -add_executable(conformance_test_d3d10 - ${D3D10_SOURCES}) - -set_source_files_properties( - ${D3D10_SOURCES} - PROPERTIES LANGUAGE CXX) - -TARGET_LINK_LIBRARIES(conformance_test_d3d10 - ${CLConform_LIBRARIES}) - -endif(WIN32) +if(WIN32) + +set(D3D10_INCLUDE_DIR $ENV{NV_TOOLS}/sdk/DirectX_Aug2009/Include) + +if(${ARCH} STREQUAL "i686") +set(D3D10_LIB_DIR $ENV{NV_TOOLS}/sdk/DirectX_Aug2009/Lib/x86) +endif(${ARCH} STREQUAL "i686") + +if(${ARCH} STREQUAL "x86_64") +set(D3D10_LIB_DIR $ENV{NV_TOOLS}/sdk/DirectX_Aug2009/Lib/x64) +endif(${ARCH} STREQUAL "x86_64") + +list(APPEND CLConform_INCLUDE_DIR ${D3D10_INCLUDE_DIR}) +include_directories (${CLConform_SOURCE_DIR}/test_common/harness + ${CLConform_INCLUDE_DIR} ) +link_directories(${CL_LIB_DIR}, ${D3D10_LIB_DIR}) + +list(APPEND CLConform_LIBRARIES d3d10 dxgi) + + +set(D3D10_SOURCES + buffer.cpp + texture2d.cpp + texture3d.cpp + misc.cpp + main.cpp + harness.cpp + ../../test_common/harness/errorHelpers.c + ../../test_common/harness/threadTesting.c + ../../test_common/harness/testHarness.c + ../../test_common/harness/kernelHelpers.c + ../../test_common/harness/mt19937.c + ../../test_common/harness/conversions.c + ../../test_common/harness/msvc9.c) + +add_executable(conformance_test_d3d10 + ${D3D10_SOURCES}) + +set_source_files_properties( + ${D3D10_SOURCES} + PROPERTIES LANGUAGE CXX) + +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) diff --git a/test_conformance/d3d11/CMakeLists.txt b/test_conformance/d3d11/CMakeLists.txt index d070e112..563fb6be 100644 --- a/test_conformance/d3d11/CMakeLists.txt +++ b/test_conformance/d3d11/CMakeLists.txt @@ -1,46 +1,51 @@ -if(WIN32) - -set(D3D11_INCLUDE_DIR $ENV{NV_TOOLS}/sdk/DirectX_Aug2009/Include) - -if(${ARCH} STREQUAL "i686") -set(D3D11_LIB_DIR $ENV{NV_TOOLS}/sdk/DirectX_Aug2009/Lib/x86) -endif(${ARCH} STREQUAL "i686") - -if(${ARCH} STREQUAL "x86_64") -set(D3D11_LIB_DIR $ENV{NV_TOOLS}/sdk/DirectX_Aug2009/Lib/x64) -endif(${ARCH} STREQUAL "x86_64") - -list(APPEND CLConform_INCLUDE_DIR ${D3D11_INCLUDE_DIR}) -include_directories (${CLConform_SOURCE_DIR}/test_common/harness - ${CLConform_INCLUDE_DIR} ) -link_directories(${CL_LIB_DIR}, ${D3D11_LIB_DIR}) - -list(APPEND CLConform_LIBRARIES d3d11 dxgi) - - -set(D3D11_SOURCES - buffer.cpp - texture2d.cpp - texture3d.cpp - misc.cpp - main.cpp - harness.cpp - ../../test_common/harness/errorHelpers.c - ../../test_common/harness/threadTesting.c - ../../test_common/harness/testHarness.c - ../../test_common/harness/kernelHelpers.c - ../../test_common/harness/mt19937.c - ../../test_common/harness/conversions.c - ../../test_common/harness/msvc9.c) - -add_executable(conformance_test_d3d11 - ${D3D11_SOURCES}) - -set_source_files_properties( - ${D3D11_SOURCES} - PROPERTIES LANGUAGE CXX) - -TARGET_LINK_LIBRARIES(conformance_test_d3d11 - ${CLConform_LIBRARIES}) - -endif(WIN32) +if(WIN32) + +set(D3D11_INCLUDE_DIR $ENV{NV_TOOLS}/sdk/DirectX_Aug2009/Include) + +if(${ARCH} STREQUAL "i686") +set(D3D11_LIB_DIR $ENV{NV_TOOLS}/sdk/DirectX_Aug2009/Lib/x86) +endif(${ARCH} STREQUAL "i686") + +if(${ARCH} STREQUAL "x86_64") +set(D3D11_LIB_DIR $ENV{NV_TOOLS}/sdk/DirectX_Aug2009/Lib/x64) +endif(${ARCH} STREQUAL "x86_64") + +list(APPEND CLConform_INCLUDE_DIR ${D3D11_INCLUDE_DIR}) +include_directories (${CLConform_SOURCE_DIR}/test_common/harness + ${CLConform_INCLUDE_DIR} ) +link_directories(${CL_LIB_DIR}, ${D3D11_LIB_DIR}) + +list(APPEND CLConform_LIBRARIES d3d11 dxgi) + + +set(D3D11_SOURCES + buffer.cpp + texture2d.cpp + texture3d.cpp + misc.cpp + main.cpp + harness.cpp + ../../test_common/harness/errorHelpers.c + ../../test_common/harness/threadTesting.c + ../../test_common/harness/testHarness.c + ../../test_common/harness/kernelHelpers.c + ../../test_common/harness/mt19937.c + ../../test_common/harness/conversions.c + ../../test_common/harness/msvc9.c) + +add_executable(conformance_test_d3d11 + ${D3D11_SOURCES}) + +set_source_files_properties( + ${D3D11_SOURCES} + PROPERTIES LANGUAGE CXX) + +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) diff --git a/test_conformance/device_partition/CMakeLists.txt b/test_conformance/device_partition/CMakeLists.txt index e7c464ba..61de5a58 100644 --- a/test_conformance/device_partition/CMakeLists.txt +++ b/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) diff --git a/test_conformance/events/CMakeLists.txt b/test_conformance/events/CMakeLists.txt index bc0375e7..1ff88ab2 100644 --- a/test_conformance/events/CMakeLists.txt +++ b/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) diff --git a/test_conformance/geometrics/CMakeLists.txt b/test_conformance/geometrics/CMakeLists.txt index 18b725ac..00748459 100644 --- a/test_conformance/geometrics/CMakeLists.txt +++ b/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) diff --git a/test_conformance/gl/CMakeLists.txt b/test_conformance/gl/CMakeLists.txt index a5c5d4ab..d0627f56 100644 --- a/test_conformance/gl/CMakeLists.txt +++ b/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) diff --git a/test_conformance/half/CMakeLists.txt b/test_conformance/half/CMakeLists.txt index 3e3e1692..68f71779 100644 --- a/test_conformance/half/CMakeLists.txt +++ b/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) diff --git a/test_conformance/headers/CMakeLists.txt b/test_conformance/headers/CMakeLists.txt index 935493b7..baab59eb 100644 --- a/test_conformance/headers/CMakeLists.txt +++ b/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) diff --git a/test_conformance/images/clCopyImage/CMakeLists.txt b/test_conformance/images/clCopyImage/CMakeLists.txt index 4c0406c6..6fe2652f 100644 --- a/test_conformance/images/clCopyImage/CMakeLists.txt +++ b/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) diff --git a/test_conformance/images/clFillImage/CMakeLists.txt b/test_conformance/images/clFillImage/CMakeLists.txt index 29ad20fb..31511bf6 100644 --- a/test_conformance/images/clFillImage/CMakeLists.txt +++ b/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) diff --git a/test_conformance/images/clGetInfo/CMakeLists.txt b/test_conformance/images/clGetInfo/CMakeLists.txt index 8805af69..a269b8dd 100644 --- a/test_conformance/images/clGetInfo/CMakeLists.txt +++ b/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) diff --git a/test_conformance/images/clReadWriteImage/CMakeLists.txt b/test_conformance/images/clReadWriteImage/CMakeLists.txt index a429a16e..c58c8f01 100644 --- a/test_conformance/images/clReadWriteImage/CMakeLists.txt +++ b/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) diff --git a/test_conformance/images/kernel_image_methods/CMakeLists.txt b/test_conformance/images/kernel_image_methods/CMakeLists.txt index 80aebcd8..e9a504a4 100644 --- a/test_conformance/images/kernel_image_methods/CMakeLists.txt +++ b/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) diff --git a/test_conformance/images/kernel_read_write/CMakeLists.txt b/test_conformance/images/kernel_read_write/CMakeLists.txt index daffad84..e77dd5f6 100644 --- a/test_conformance/images/kernel_read_write/CMakeLists.txt +++ b/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) diff --git a/test_conformance/images/samplerlessReads/CMakeLists.txt b/test_conformance/images/samplerlessReads/CMakeLists.txt index d7fbdf91..b514daa3 100644 --- a/test_conformance/images/samplerlessReads/CMakeLists.txt +++ b/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) diff --git a/test_conformance/integer_ops/CMakeLists.txt b/test_conformance/integer_ops/CMakeLists.txt index 29e38272..8e06ed5d 100644 --- a/test_conformance/integer_ops/CMakeLists.txt +++ b/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) diff --git a/test_conformance/math_brute_force/CMakeLists.txt b/test_conformance/math_brute_force/CMakeLists.txt index ac6dafcb..0e3e86f9 100644 --- a/test_conformance/math_brute_force/CMakeLists.txt +++ b/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) diff --git a/test_conformance/mem_host_flags/CMakeLists.txt b/test_conformance/mem_host_flags/CMakeLists.txt index d5319097..0b13eb48 100644 --- a/test_conformance/mem_host_flags/CMakeLists.txt +++ b/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) diff --git a/test_conformance/multiple_device_context/CMakeLists.txt b/test_conformance/multiple_device_context/CMakeLists.txt index 69291f64..84dd1f11 100644 --- a/test_conformance/multiple_device_context/CMakeLists.txt +++ b/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) diff --git a/test_conformance/printf/CMakeLists.txt b/test_conformance/printf/CMakeLists.txt index f366ee59..709678af 100644 --- a/test_conformance/printf/CMakeLists.txt +++ b/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) diff --git a/test_conformance/profiling/CMakeLists.txt b/test_conformance/profiling/CMakeLists.txt index a82e2742..f25675db 100644 --- a/test_conformance/profiling/CMakeLists.txt +++ b/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) diff --git a/test_conformance/relationals/CMakeLists.txt b/test_conformance/relationals/CMakeLists.txt index c2abf81d..8430b8ba 100644 --- a/test_conformance/relationals/CMakeLists.txt +++ b/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) diff --git a/test_conformance/select/CMakeLists.txt b/test_conformance/select/CMakeLists.txt index 12d383ee..cab78af7 100644 --- a/test_conformance/select/CMakeLists.txt +++ b/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) diff --git a/test_conformance/spir/CMakeLists.txt b/test_conformance/spir/CMakeLists.txt index 31bc31b0..93ff534d 100644 --- a/test_conformance/spir/CMakeLists.txt +++ b/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" "$/vec_step.zip" COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/binary_type.zip" "$/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 # diff --git a/test_conformance/thread_dimensions/CMakeLists.txt b/test_conformance/thread_dimensions/CMakeLists.txt index da18c628..b2baa719 100644 --- a/test_conformance/thread_dimensions/CMakeLists.txt +++ b/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) diff --git a/test_conformance/vec_align/CMakeLists.txt b/test_conformance/vec_align/CMakeLists.txt index 9d7b5f89..eab91377 100644 --- a/test_conformance/vec_align/CMakeLists.txt +++ b/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) diff --git a/test_conformance/vec_step/CMakeLists.txt b/test_conformance/vec_step/CMakeLists.txt index 49fb64da..3083f338 100644 --- a/test_conformance/vec_step/CMakeLists.txt +++ b/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)