From 2878e8eb2e27a5f603f029e4922eef30028a5a4e Mon Sep 17 00:00:00 2001 From: Ryan Lai Date: Thu, 3 Dec 2020 09:28:39 -0800 Subject: [PATCH] Fix nuget build error (#6009) --- cmake/nuget_helpers.cmake | 10 +++++----- cmake/winml.cmake | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/nuget_helpers.cmake b/cmake/nuget_helpers.cmake index 62a222390d..e3296e1111 100644 --- a/cmake/nuget_helpers.cmake +++ b/cmake/nuget_helpers.cmake @@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.0) # # id : package id # out : name of variable to set result -function(pkg_version id out packages_config) +function(package_version id out packages_config) file(READ ${packages_config} packages_config_contents) string(REGEX MATCH "package[ ]*id[ ]*=[ ]*\"${id}\"" found_package_id ${packages_config_contents}) if (NOT(found_package_id)) @@ -32,8 +32,8 @@ function( # Retrieve the latest version of nuget include(ExternalProject) - ExternalProject_Add(nuget - PREFIX nuget + ExternalProject_Add(nuget_exe + PREFIX nuget_exe URL "https://dist.nuget.org/win-x86-commandline/v5.3.0/nuget.exe" DOWNLOAD_NO_EXTRACT 1 CONFIGURE_COMMAND "" @@ -49,9 +49,9 @@ function( add_custom_command( OUTPUT ${target_dependency} DEPENDS ${PACKAGES_CONFIG} ${NUGET_CONFIG} - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/nuget/src/nuget restore ${PACKAGES_CONFIG} -PackagesDirectory ${PACKAGES_DIR} -ConfigFile ${NUGET_CONFIG} + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/nuget_exe/src/nuget restore ${PACKAGES_CONFIG} -PackagesDirectory ${PACKAGES_DIR} -ConfigFile ${NUGET_CONFIG} VERBATIM) add_custom_target(${nuget_target} DEPENDS ${target_dependency}) - add_dependencies(${nuget_target} nuget) + add_dependencies(${nuget_target} nuget_exe) endfunction() \ No newline at end of file diff --git a/cmake/winml.cmake b/cmake/winml.cmake index 7946794f31..2611ce3e50 100644 --- a/cmake/winml.cmake +++ b/cmake/winml.cmake @@ -28,7 +28,7 @@ set(winml_lib_common_dir ${REPO_ROOT}/winml/lib/common) set(winml_lib_telemetry_dir ${REPO_ROOT}/winml/lib/telemetry) # Retrieve the version of cppwinrt nuget -pkg_version( +package_version( Microsoft.Windows.CppWinRT CppWinRT_version ${PROJECT_SOURCE_DIR}/../packages.config