ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-23 15:39:03 +00:00
Code Packages Projects Releases Wiki Activity

Fixes #488 - cmake adjustment d3d and media_sharing (#489)

Browse Source
This commit is contained in:
Grzegorz Wawiorko
2019-11-15 14:12:17 +01:00
committed by Kévin Petit
parent d7e8e5040a
commit 1bffbbe3e4
5 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -177,6 +177,7 @@ endif(CMAKE_BUILD_TYPE STREQUAL "release")
add_subdirectory(test_common) add_subdirectory(test_common)
add_subdirectory(test_conformance) add_subdirectory(test_conformance)
add_subdirectory(test_extensions)
set (PY_PATH "${CLConform_SOURCE_DIR}/test_conformance/*.py") set (PY_PATH "${CLConform_SOURCE_DIR}/test_conformance/*.py")
set (CSV_PATH "${CLConform_SOURCE_DIR}/test_conformance/*.csv") set (CSV_PATH "${CLConform_SOURCE_DIR}/test_conformance/*.csv")
@@ -220,4 +221,3 @@ if(MSVC)
endif(MSVC) endif(MSVC)
set_property(TARGET COPY_FILES${CONFORMANCE_SUFFIX} PROPERTY FOLDER "CONFORMANCE${CONFORMANCE_SUFFIX}") set_property(TARGET COPY_FILES${CONFORMANCE_SUFFIX} PROPERTY FOLDER "CONFORMANCE${CONFORMANCE_SUFFIX}")
add_subdirectory( "test_extensions" )

13
test_conformance/d3d10/CMakeLists.txt
View File

@@ -17,8 +17,9 @@ link_directories(${CL_LIB_DIR}, ${D3D10_LIB_DIR})
list(APPEND CLConform_LIBRARIES d3d10 dxgi) list(APPEND CLConform_LIBRARIES d3d10 dxgi)
set(MODULE_NAME D3D10)
set(D3D10_SOURCES set(${MODULE_NAME}_SOURCES
buffer.cpp buffer.cpp
texture2d.cpp texture2d.cpp
texture3d.cpp texture3d.cpp
@@ -27,14 +28,10 @@ set(D3D10_SOURCES
harness.cpp harness.cpp
) )
add_executable(conformance_test_d3d10
${D3D10_SOURCES})
set_source_files_properties( set_source_files_properties(
${D3D10_SOURCES} ${MODULE_NAME}_SOURCES
PROPERTIES LANGUAGE CXX) PROPERTIES LANGUAGE CXX)
TARGET_LINK_LIBRARIES(conformance_test_d3d10 harness include_directories(${CMAKE_CURRENT_SOURCE_DIR})
${CLConform_LIBRARIES}) include(../CMakeCommon.txt)
endif(WIN32) endif(WIN32)

13
test_conformance/d3d11/CMakeLists.txt
View File

@@ -17,8 +17,9 @@ link_directories(${CL_LIB_DIR}, ${D3D11_LIB_DIR})
list(APPEND CLConform_LIBRARIES d3d11 dxgi) list(APPEND CLConform_LIBRARIES d3d11 dxgi)
set(MODULE_NAME D3D11)
set(D3D11_SOURCES set(${MODULE_NAME}_SOURCES
buffer.cpp buffer.cpp
texture2d.cpp texture2d.cpp
texture3d.cpp texture3d.cpp
@@ -27,14 +28,10 @@ set(D3D11_SOURCES
harness.cpp harness.cpp
) )
add_executable(conformance_test_d3d11
${D3D11_SOURCES})
set_source_files_properties( set_source_files_properties(
${D3D11_SOURCES} ${MODULE_NAME}_SOURCES
PROPERTIES LANGUAGE CXX) PROPERTIES LANGUAGE CXX)
TARGET_LINK_LIBRARIES(conformance_test_d3d11 harness include_directories(${CMAKE_CURRENT_SOURCE_DIR})
${CLConform_LIBRARIES}) include(../CMakeCommon.txt)
endif(WIN32) endif(WIN32)

1
test_extensions/CMakeLists.txt
View File

@@ -1 +1,2 @@
set(HARNESS_LIB harness)
add_subdirectory( media_sharing ) add_subdirectory( media_sharing )

12
test_extensions/media_sharing/CMakeLists.txt
View File

@@ -1,7 +1,8 @@
if(WIN32) if(WIN32)
list(APPEND CLConform_LIBRARIES d3d9.lib dxva2.lib ) list(APPEND CLConform_LIBRARIES d3d9.lib dxva2.lib )
set(MODULE_NAME MEDIA_SURFACE_SHARING)
set (MEDIA_SOURCES set(${MODULE_NAME}_SOURCES
main.cpp main.cpp
wrappers.cpp wrappers.cpp
utils.cpp utils.cpp
@@ -14,14 +15,11 @@ set (MEDIA_SOURCES
test_other_data_types.cpp test_other_data_types.cpp
) )
add_executable(conformance_test_media_surface_sharing
${MEDIA_SOURCES})
set_source_files_properties( set_source_files_properties(
${MEDIA_SOURCES} ${MODULE_NAME}_SOURCES
PROPERTIES LANGUAGE CXX) PROPERTIES LANGUAGE CXX)
TARGET_LINK_LIBRARIES(conformance_test_media_surface_sharing harness include_directories(${CMAKE_CURRENT_SOURCE_DIR})
${CLConform_LIBRARIES})
include(../../test_conformance/CMakeCommon.txt)
endif(WIN32) endif(WIN32)