File tree Expand file tree Collapse file tree 4 files changed +6
-4
lines changed Expand file tree Collapse file tree 4 files changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -2,3 +2,4 @@ get_filename_component(CLR_REPO_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/../.. ABSOLUT
22set (CLR_ENG_NATIVE_DIR ${CMAKE_CURRENT_LIST_DIR} )
33get_filename_component (CLR_SRC_NATIVE_DIR ${CMAKE_CURRENT_LIST_DIR} /../../src/native ABSOLUTE )
44get_filename_component (CLR_SRC_LIBS_NATIVE_DIR ${CMAKE_CURRENT_LIST_DIR} /../../src/libraries/Native ABSOLUTE )
5+ set (CLR_ARTIFACTS_OBJ_DIR ${CLR_REPO_ROOT_DIR} /artifacts/obj)
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ set(CLR_DIR ${CMAKE_CURRENT_SOURCE_DIR})
2727set (VM_DIR ${CMAKE_CURRENT_SOURCE_DIR} /vm)
2828set (GENERATED_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} /inc)
2929set (GENERATED_EVENTING_DIR ${CMAKE_CURRENT_BINARY_DIR} /Eventing)
30- set (VERSION_FILE_PATH "${CMAKE_BINARY_DIR} /version.c" )
30+ set (CLR_ARTIFACTS_OBJ_DIR "${CMAKE_BINARY_DIR} /version.c" )
3131set (PAL_REDEFINES_FILE ${CMAKE_CURRENT_SOURCE_DIR} /dlls/mscordac/palredefines.S)
3232
3333# Avoid logging when skipping up-to-date copies
Original file line number Diff line number Diff line change @@ -203,7 +203,7 @@ if(CLR_CMAKE_HOST_WIN32)
203203 if (LONG_NAME_TARGET_ARCH STREQUAL x64)
204204 set (LONG_NAME_TARGET_ARCH "amd64" )
205205 endif ()
206- set (NATIVE_VERSION_HEADER_FILE "${CLR_DIR} /../../artifacts/obj/coreclr/ _version.h" )
206+ set (NATIVE_VERSION_HEADER_FILE "${CLR_DIR} /../../artifacts/obj/_version.h" )
207207 message ("Read file version from native version header at '${NATIVE_VERSION_HEADER_FILE} '." )
208208 file (READ "${NATIVE_VERSION_HEADER_FILE} " NATIVE_VERSION_HEADER)
209209 string (REGEX MATCH "#define VER_FILEVERSION[ \t ]+[0-9]+(,[0-9]+)+" FILE_VERSION_LINE "${NATIVE_VERSION_HEADER} " )
Original file line number Diff line number Diff line change 11<Project Sdk =" Microsoft.Build.NoTargets" >
22 <PropertyGroup >
3- <NativeVersionFile >$(ArtifactsObjDir)coreclr/_version.h</NativeVersionFile >
4- <RuntimeVersionFile >$(ArtifactsObjDir)coreclr/runtime_version.h</RuntimeVersionFile >
3+ <NativeVersionFile Condition =" $([MSBuild]::IsOsPlatform(Windows))" >$(ArtifactsObjDir)_version.h</NativeVersionFile >
4+ <NativeVersionFile Condition =" !$([MSBuild]::IsOsPlatform(Windows))" >$(ArtifactsObjDir)_version.c</NativeVersionFile >
5+ <RuntimeVersionFile >$(ArtifactsObjDir)runtime_version.h</RuntimeVersionFile >
56 </PropertyGroup >
67
78 <ItemGroup >
You can’t perform that action at this time.
0 commit comments