mirror of
https://github.com/KhronosGroup/OpenCL-CTS.git
synced 2026-03-19 06:09:01 +00:00
Update D3D10 and D3D11 interop tests (#2479)
Both tests depend on a very old DirectX SDK (August 2009) and expect it
to be extracted to an {NV_TOOLS} environment variable. They additionally
require definining {ARCH} as a CMake configuration option, which is not
needed.
Update both projects to use DirectX libraries provided by the Windows
SDK and drop the unneeded configuration options.
---------
Signed-off-by: Ahmed Hesham <ahmed.hesham@arm.com>
This commit is contained in:
@@ -1,22 +1,4 @@
|
||||
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(MODULE_NAME D3D11)
|
||||
|
||||
set(${MODULE_NAME}_SOURCES
|
||||
@@ -28,10 +10,9 @@ set(${MODULE_NAME}_SOURCES
|
||||
harness.cpp
|
||||
)
|
||||
|
||||
set_source_files_properties(
|
||||
${MODULE_NAME}_SOURCES
|
||||
PROPERTIES LANGUAGE CXX)
|
||||
list(APPEND CLConform_LIBRARIES d3d11 dxgi)
|
||||
|
||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
|
||||
include(../CMakeCommon.txt)
|
||||
endif(WIN32)
|
||||
else()
|
||||
message(STATUS "D3D11 tests are only supported on Windows.")
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user