Skip to content

Commit f4d1179

Browse files
jackhortonjackhorton
committed
Check for generated props file before including it
1 parent c32763b commit f4d1179

7 files changed

Lines changed: 7 additions & 7 deletions

‎Build/Chakra.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<UseICU Condition="'$(BuildLite)'=='true'">false</UseICU>
3030
<UseICU Condition="'$(ChakraICU)'!='false'">true</UseICU>
3131
</PropertyGroup>
32-
<Import Condition="'$(ChakraICU)'!='false'" Project="$(ChakraCoreRootDirectory)deps\Chakra.ICU\Chakra.ICU.props" />
32+
<Import Condition="'$(ChakraICU)'!='false' AND exists('$(ChakraCoreRootDirectory)deps\Chakra.ICU\Chakra.ICU.props')" Project="$(ChakraCoreRootDirectory)deps\Chakra.ICU\Chakra.ICU.props" />
3333
<ItemDefinitionGroup>
3434
<ClCompile>
3535
<PreprocessorDefinitions>

‎deps/Chakra.ICU/Chakra.ICU.Common.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Condition="'$(ChakraBuildPathImported)'!='true'" Project="$(SolutionDir)Chakra.Build.Paths.props" />
44
<Import Project="$(BuildConfigPropsPath)Chakra.Build.ProjectConfiguration.props" />
5-
<Import Project="$(MSBuildThisFileDirectory)Chakra.ICU.props" />
5+
<Import Condition="exists('$(ChakraCoreRootDirectory)deps\Chakra.ICU\Chakra.ICU.props')" Project="$(MSBuildThisFileDirectory)Chakra.ICU.props" />
66
<PropertyGroup Label="Globals">
77
<TargetName>Chakra.ICU.Common</TargetName>
88
<ProjectGuid>{EE2A3111-4D85-427C-B0AB-E6B0EA7FFB44}</ProjectGuid>

‎deps/Chakra.ICU/Chakra.ICU.Data.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Condition="'$(ChakraBuildPathImported)'!='true'" Project="$(SolutionDir)Chakra.Build.Paths.props" />
44
<Import Project="$(BuildConfigPropsPath)Chakra.Build.ProjectConfiguration.props" />
5-
<Import Project="$(MSBuildThisFileDirectory)Chakra.ICU.props" />
5+
<Import Condition="exists('$(ChakraCoreRootDirectory)deps\Chakra.ICU\Chakra.ICU.props')" Project="$(MSBuildThisFileDirectory)Chakra.ICU.props" />
66
<PropertyGroup Label="Globals">
77
<TargetName>Chakra.ICU.Data</TargetName>
88
<ProjectGuid>{347824B1-7100-4EE6-8A6B-4FF64E66B0C0}</ProjectGuid>

‎deps/Chakra.ICU/Chakra.ICU.GenCCode.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Condition="'$(ChakraBuildPathImported)'!='true'" Project="$(SolutionDir)Chakra.Build.Paths.props" />
44
<Import Project="$(BuildConfigPropsPath)Chakra.Build.ProjectConfiguration.props" />
5-
<Import Project="$(MSBuildThisFileDirectory)Chakra.ICU.props" />
5+
<Import Condition="exists('$(ChakraCoreRootDirectory)deps\Chakra.ICU\Chakra.ICU.props')" Project="$(MSBuildThisFileDirectory)Chakra.ICU.props" />
66
<PropertyGroup Label="Globals">
77
<TargetName>Chakra.ICU.GenCCode</TargetName>
88
<ProjectGuid>{FA9E9590-0E6C-40F9-9527-E608F2DFA76D}</ProjectGuid>

‎deps/Chakra.ICU/Chakra.ICU.Stubdata.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Condition="'$(ChakraBuildPathImported)'!='true'" Project="$(SolutionDir)Chakra.Build.Paths.props" />
44
<Import Project="$(BuildConfigPropsPath)Chakra.Build.ProjectConfiguration.props" />
5-
<Import Project="$(MSBuildThisFileDirectory)Chakra.ICU.props" />
5+
<Import Condition="exists('$(ChakraCoreRootDirectory)deps\Chakra.ICU\Chakra.ICU.props')" Project="$(MSBuildThisFileDirectory)Chakra.ICU.props" />
66
<PropertyGroup Label="Globals">
77
<TargetName>Chakra.ICU.Stubdata</TargetName>
88
<ProjectGuid>{E14F373D-05A0-4259-A5E9-AFE8405FB847}</ProjectGuid>

‎deps/Chakra.ICU/Chakra.ICU.Toolutil.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Condition="'$(ChakraBuildPathImported)'!='true'" Project="$(SolutionDir)Chakra.Build.Paths.props" />
44
<Import Project="$(BuildConfigPropsPath)Chakra.Build.ProjectConfiguration.props" />
5-
<Import Project="$(MSBuildThisFileDirectory)Chakra.ICU.props" />
5+
<Import Condition="exists('$(ChakraCoreRootDirectory)deps\Chakra.ICU\Chakra.ICU.props')" Project="$(MSBuildThisFileDirectory)Chakra.ICU.props" />
66
<PropertyGroup Label="Globals">
77
<TargetName>Chakra.ICU.Toolutil</TargetName>
88
<ProjectGuid>{A87105AD-8F4A-4D7A-9096-EFD30DBA3E01}</ProjectGuid>

‎deps/Chakra.ICU/Chakra.ICU.i18n.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Condition="'$(ChakraBuildPathImported)'!='true'" Project="$(SolutionDir)Chakra.Build.Paths.props" />
44
<Import Project="$(BuildConfigPropsPath)Chakra.Build.ProjectConfiguration.props" />
5-
<Import Project="$(MSBuildThisFileDirectory)Chakra.ICU.props" />
5+
<Import Condition="exists('$(ChakraCoreRootDirectory)deps\Chakra.ICU\Chakra.ICU.props')" Project="$(MSBuildThisFileDirectory)Chakra.ICU.props" />
66
<PropertyGroup Label="Globals">
77
<TargetName>Chakra.ICU.i18n</TargetName>
88
<ProjectGuid>{0494C753-5BB9-45AA-874E-E61B9922E88F}</ProjectGuid>

0 commit comments

Comments
 (0)