diff --git a/cmake/winml.cmake b/cmake/winml.cmake index c2ee74e799..4207c55b3f 100644 --- a/cmake/winml.cmake +++ b/cmake/winml.cmake @@ -169,6 +169,7 @@ if (onnxruntime_USE_TELEMETRY) endif() # Compiler flags +target_compile_definitions(winml_lib_telemetry PRIVATE WINML_ROOT_NS=${winml_root_ns}) target_compile_definitions(winml_lib_telemetry PRIVATE PLATFORM_WINDOWS) target_compile_definitions(winml_lib_telemetry PRIVATE _SCL_SECURE_NO_WARNINGS) # remove warnings about unchecked iterators target_compile_definitions(winml_lib_telemetry PRIVATE BINARY_NAME=\"${BINARY_NAME}\") @@ -177,7 +178,10 @@ target_compile_definitions(winml_lib_telemetry PRIVATE BINARY_NAME=\"${BINARY_NA target_precompiled_header(winml_lib_telemetry pch.h) # Includes -target_include_directories(winml_lib_telemetry PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/winml/sdk/cppwinrt/include) +target_include_directories(winml_lib_telemetry PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) # windows machine learning generated component headers +target_include_directories(winml_lib_telemetry PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/winml_api) # windows machine learning generated component headers +target_include_directories(winml_lib_telemetry PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/winml_api/comp_generated) # windows machine learning generated component headers +target_include_directories(winml_lib_telemetry PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/winml/sdk/cppwinrt/include) # sdk cppwinrt headers target_include_directories(winml_lib_telemetry PRIVATE ${CMAKE_SOURCE_DIR}/common/inc) target_include_directories(winml_lib_telemetry PRIVATE ${winml_lib_telemetry_dir}) target_include_directories(winml_lib_telemetry PRIVATE ${winml_lib_common_dir}/inc) @@ -189,6 +193,12 @@ set_target_properties(winml_lib_telemetry FOLDER ${target_folder}) +# Add deps +add_dependencies(winml_lib_telemetry winml_sdk_cppwinrt) +add_dependencies(winml_lib_telemetry winml_api) +add_dependencies(winml_lib_telemetry winml_api_native) +add_dependencies(winml_lib_telemetry winml_api_native_internal) + # Link libraries target_link_libraries(winml_lib_telemetry PRIVATE wil) diff --git a/winml/lib/Common/inc/winrt_headers.h b/winml/lib/Common/inc/winrt_headers.h index a1f57871f2..2791016be7 100644 --- a/winml/lib/Common/inc/winrt_headers.h +++ b/winml/lib/Common/inc/winrt_headers.h @@ -5,7 +5,7 @@ #include "common.h" -#include +#include "winrt/windows.media.h" #include "winrt/windows.graphics.imaging.h" #include "winrt/windows.foundation.h" #include "winrt/windows.foundation.collections.h" diff --git a/winml/lib/Telemetry/pch.h b/winml/lib/Telemetry/pch.h index 5ec2dd9e47..976f62c7f9 100644 --- a/winml/lib/Telemetry/pch.h +++ b/winml/lib/Telemetry/pch.h @@ -3,6 +3,6 @@ #pragma once -#include "common.h" +#include "winrt_headers.h" #include "TraceLoggingConfig.h" #include "NamespaceAliases.h" \ No newline at end of file