diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 176af040ba..9f1174bd24 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -686,11 +686,6 @@ if (onnxruntime_USE_DML) include(dml) endif() -# allow the caller to tell us where the nuget packages are going -if ("${REPO_PACKAGE_LOCATION}" STREQUAL "") - set(REPO_PACKAGE_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/packages) -endif() - #names in this var must match the directory names under onnxruntime/core/providers set(ONNXRUNTIME_PROVIDER_NAMES cpu) diff --git a/cmake/external/dml.cmake b/cmake/external/dml.cmake index 99e4fa0404..41de28fdd2 100644 --- a/cmake/external/dml.cmake +++ b/cmake/external/dml.cmake @@ -35,5 +35,4 @@ if (NOT onnxruntime_USE_CUSTOM_DIRECTML) list(APPEND onnxruntime_EXTERNAL_DEPENDENCIES RESTORE_PACKAGES) else() include_directories(${dml_INCLUDE_DIR}) - link_directories(${dml_LIB_DIR}) endif() diff --git a/cmake/onnxruntime_providers.cmake b/cmake/onnxruntime_providers.cmake index fb03b444bf..0988dc0def 100644 --- a/cmake/onnxruntime_providers.cmake +++ b/cmake/onnxruntime_providers.cmake @@ -430,7 +430,7 @@ if (onnxruntime_USE_DML) add_dependencies(onnxruntime_providers_dml ${onnxruntime_EXTERNAL_DEPENDENCIES}) target_include_directories(onnxruntime_providers_dml PRIVATE ${ONNXRUNTIME_ROOT} ${ONNXRUNTIME_ROOT}/../cmake/external/wil/include) - target_link_libraries(onnxruntime_providers_dml ${REPO_PACKAGE_LOCATION}/DirectML.0.0.1/build/DirectML.targets) + target_link_libraries(onnxruntime_providers_dml ${CMAKE_CURRENT_BINARY_DIR}/packages/DirectML.0.0.1/build/DirectML.targets) target_link_libraries(onnxruntime_providers_dml d3d12.lib dxgi.lib) list(APPEND ONNXRUNTIME_LINKER_FLAGS "/DELAYLOAD:DirectML.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll") diff --git a/cmake/winml.cmake b/cmake/winml.cmake index 3a33b0f281..8112392705 100644 --- a/cmake/winml.cmake +++ b/cmake/winml.cmake @@ -162,7 +162,7 @@ add_dependencies(winml_adapter winml_api_native_internal) # Link libraries target_link_libraries(winml_adapter PRIVATE wil) if (onnxruntime_USE_DML) - target_link_libraries(winml_adapter PRIVATE ${REPO_PACKAGE_LOCATION}/DirectML.0.0.1/build/DirectML.targets) + target_link_libraries(winml_adapter PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/packages/DirectML.0.0.1/build/DirectML.targets) endif(onnxruntime_USE_DML) # add it to the onnxruntime shared library @@ -329,6 +329,7 @@ set_target_properties(winml_lib_api ${target_folder}) # Add deps +add_dependencies(winml_lib_api onnx) add_dependencies(winml_lib_api winml_sdk_cppwinrt) add_dependencies(winml_lib_api winml_api) add_dependencies(winml_lib_api winml_api_native)