From 8cc161aec603443bd2de627e37cd3db75df7510d Mon Sep 17 00:00:00 2001 From: Jeff Bloomfield Date: Sat, 25 Apr 2020 18:48:07 -0700 Subject: [PATCH] Remove problematic change for dxcore.lib --- cmake/onnxruntime_providers.cmake | 1 + cmake/test_dxcore.cpp | 8 -------- cmake/winml.cmake | 5 ----- 3 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 cmake/test_dxcore.cpp diff --git a/cmake/onnxruntime_providers.cmake b/cmake/onnxruntime_providers.cmake index 11d8e031e0..572a46510b 100644 --- a/cmake/onnxruntime_providers.cmake +++ b/cmake/onnxruntime_providers.cmake @@ -452,6 +452,7 @@ if (onnxruntime_USE_DML) else() add_dependencies(${target} RESTORE_PACKAGES) target_link_libraries(${target} PRIVATE "${DML_PACKAGE_DIR}/bin/${onnxruntime_target_platform}/DirectML.lib") + target_compile_definitions(${target} PRIVATE DML_TARGET_VERSION_USE_LATEST) endif() target_link_options(${target} PUBLIC /DELAYLOAD:directml.dll /DELAYLOAD:dxgi.dll /DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll) endfunction() diff --git a/cmake/test_dxcore.cpp b/cmake/test_dxcore.cpp deleted file mode 100644 index 22cbf49a79..0000000000 --- a/cmake/test_dxcore.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// CMake's CHECK_INCLUDE_FILE_CXX macro can't be used because it doesn't check the machine's SDK folder -#if not __has_include("dxcore.h") -#error -#endif - -int main() { - return 0; -} diff --git a/cmake/winml.cmake b/cmake/winml.cmake index d0e246be9b..ada59eebc6 100644 --- a/cmake/winml.cmake +++ b/cmake/winml.cmake @@ -272,7 +272,6 @@ target_link_libraries(winml_adapter PRIVATE wil) if (onnxruntime_USE_DML) target_add_dml(winml_adapter) endif(onnxruntime_USE_DML) - # add it to the onnxruntime shared library set(onnxruntime_winml winml_adapter) list(APPEND onnxruntime_EXTERNAL_DEPENDENCIES winml_adapter) @@ -350,10 +349,6 @@ add_dependencies(winml_lib_image winml_api_native_internal) target_link_libraries(winml_lib_image PRIVATE dxgi d3d11 d3d12 wil winml_lib_common) get_target_property(winml_lib_image_include_directories winml_lib_image INCLUDE_DIRECTORIES) -try_compile(has_dxcore "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/test_dxcore.cpp" CMAKE_FLAGS -DLINK_DIRECTORIES="${winml_lib_image_include_directories}") -if (has_dxcore) - target_link_libraries(winml_lib_image PRIVATE dxcore) -endif() if (onnxruntime_USE_DML) target_add_dml(winml_lib_image)