From db20f3f1bb8595633a7e16c8900fd401a453a6b5 Mon Sep 17 00:00:00 2001 From: Jiyoung Yun Date: Tue, 27 Dec 2016 16:46:08 +0900 Subject: Imported Upstream version 1.0.0.9127 --- pgosupport.cmake | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'pgosupport.cmake') diff --git a/pgosupport.cmake b/pgosupport.cmake index 27fe13df6d..015eed6a0f 100644 --- a/pgosupport.cmake +++ b/pgosupport.cmake @@ -13,7 +13,7 @@ function(add_pgo TargetName) endif(WIN32) file(TO_NATIVE_PATH - "${CLR_CMAKE_PACKAGES_DIR}/${CLR_CMAKE_OPTDATA_PACKAGEWITHRID}/${CLR_CMAKE_OPTDATA_VERSION}/data/${ProfileFileName}" + "${CLR_CMAKE_PACKAGES_DIR}/Microsoft.DotNet.OptimizationData.Coreclr/${CLR_CMAKE_TARGET_OS}.${CLR_CMAKE_TARGET_ARCH}/${ProfileFileName}" ProfilePath ) @@ -37,18 +37,6 @@ function(add_pgo TargetName) endforeach(ConfigType) endfunction(add_pgo) -set(CLR_CMAKE_OPTDATA_PACKAGEID "optimization.PGO.CoreCLR") -set(CLR_CMAKE_OPTDATA_PACKAGEWITHRID "optimization.${CLR_CMAKE_TARGET_OS}-${CLR_CMAKE_TARGET_ARCH}.PGO.CoreCLR") - -# Parse optdata package version from project.json -file(TO_NATIVE_PATH "${CMAKE_SOURCE_DIR}/extract-from-json.py" ExtractFromJsonScript) -file(TO_NATIVE_PATH "${CMAKE_SOURCE_DIR}/src/.nuget/optdata/project.json" OptDataProjectJsonPath) -execute_process( - COMMAND python "${ExtractFromJsonScript}" -rf "${OptDataProjectJsonPath}" dependencies "${CLR_CMAKE_OPTDATA_PACKAGEID}" - OUTPUT_VARIABLE CLR_CMAKE_OPTDATA_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE -) - if(WIN32) if(CLR_CMAKE_PGO_INSTRUMENT) # Instrumented PGO binaries on Windows introduce an additional runtime dependency, pgort.dll. -- cgit v1.2.3