Skip to content

Commit 1acc2d3

Browse files
committed
Enable CRT check
1 parent 6d461dd commit 1acc2d3

File tree

1 file changed

+26
-1
lines changed

1 file changed

+26
-1
lines changed

win/mysql-conncpp-msi-template.xml.in

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,31 @@ already installed." />
3434
<Custom Action="NewerVersionInstalled" After="FindRelatedProducts">NEWERPRODUCTFOUND</Custom>
3535
<RemoveExistingProducts After="InstallInitialize"/>
3636
</InstallExecuteSequence>
37+
<?if "@CONNECTOR_PLATFORM_SUFFIX@"="winx64"?>
38+
<Property Id="VS14REDISTX64">
39+
<RegistrySearch Id="FindRedistVS14"
40+
Win64="no"
41+
Root="HKLM"
42+
Key="SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64"
43+
Name="Version"
44+
Type="raw" />
45+
</Property>
46+
<Condition Message="This application requires Visual Studio 2015 x64 Redistributable. Please install the Redistributable then run this installer again.">
47+
Installed OR VS14REDISTX64
48+
</Condition>
49+
<?elseif "@CONNECTOR_PLATFORM_SUFFIX@"="win32" ?>
50+
<Property Id="VS12REDISTX86">
51+
<RegistrySearch Id="FindRedistVS14"
52+
Win64="no"
53+
Root="HKLM"
54+
Key="SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86"
55+
Name="Version"
56+
Type="raw" />
57+
</Property>
58+
<Condition Message="This application requires Visual Studio 2015 x86 Redistributable. Please install the Redistributable then run this installer again.">
59+
Installed OR VS14REDISTX86
60+
</Condition>
61+
<?endif?>
3762

3863
<!-- File definitions -->
3964
<Media Id="1" Cabinet="Product.cab" EmbedCab="yes" />
@@ -100,7 +125,7 @@ already installed." />
100125
<File Id="file0102" Name="mycppcon.pdb" LongName="mysqlcppconn.pdb" Source="$(var.BuildDir)\..\driver\debug\mysqlcppconn.pdb" />
101126
<File Id="file0103" Name="mycpstat.lib" LongName="mysqlcppconn-static.lib" Source="$(var.BuildDir)\..\driver\debug\mysqlcppconn-static.lib" />
102127
<File Id="file0104" Name="mycpstat.pdb" LongName="mysqlcppconn-static.pdb" Source="$(var.BuildDir)\..\driver\debug\mysqlcppconn-static.pdb" />
103-
</Component>
128+
</Component>
104129
</Directory>
105130
-->
106131
<Directory Id="opt" Name="opt">

0 commit comments

Comments
 (0)