Skip to content

Commit 7e57e33

Browse files
committed
test: improve project structure
1 parent 57928cc commit 7e57e33

10 files changed

Lines changed: 19 additions & 5 deletions

File tree

src/DOpusScriptingExtensions/DOpusScriptingExtensions.vcxproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<UseDebugLibraries>true</UseDebugLibraries>
2323
<PlatformToolset>v145</PlatformToolset>
2424
<CharacterSet>Unicode</CharacterSet>
25+
<EnableASAN>true</EnableASAN>
2526
</PropertyGroup>
2627
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
2728
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -200,7 +201,7 @@
200201
</ImportGroup>
201202
<!-- Copy magic.mgc file that is needed for LibMagic -->
202203
<Target Name="CopyMagicMgcFileToOutputFolder" AfterTargets="Build" Condition="!Exists('$(OutputPath)/magic.mgc')">
203-
<Copy SourceFiles="$(ProjectRoot)/vcpkg_installed/x64-windows-static/vcpkg/pkgs/libmagic_x64-windows/share/libmagic/misc/magic.mgc" DestinationFolder="$(OutputPath)" />
204+
<Copy SourceFiles="$(BuildFolder)/vi/vcpkg/pkgs/libmagic_x64-windows-static/share/libmagic/misc/magic.mgc" DestinationFolder="$(OutputPath)" />
204205
</Target>
205206
<!-- Download ExifTool binaries -->
206207
<Target Name="DownloadExifTool" AfterTargets="Build" Condition="!Exists('$(BuildFolder)exiftool.zip')">
@@ -219,4 +220,4 @@
219220
<Target Name="CopyMediaInfoLanguagesToOutputFolder" AfterTargets="DownloadMediaInfo" Condition="!Exists('$(OutputPath)MediaInfoLanguages')">
220221
<Exec Command="robocopy &quot;$(BuildFolder)MediaInfo-26.01/Source/Resource/Plugin/Language&quot; &quot;$(OutputPath)MediaInfoLanguages&quot; /e &gt; nul" ContinueOnError="True" />
221222
</Target>
222-
</Project>
223+
</Project>

src/Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
<InstallerVersion>0.0</InstallerVersion>
88
<OutDir>$(OutputPath)</OutDir>
99
<IntDir>$(BaseIntermediateOutputPath)</IntDir>
10+
<VcpkgInstalledDir>$(BuildFolder)vi</VcpkgInstalledDir>
1011
</PropertyGroup>
1112
</Project>

src/Test/test.js

12 Bytes
Binary file not shown.

vcpkg.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"vcpkg-configuration": {
33
"default-registry": {
44
"kind": "git",
5-
"baseline": "ac7af7424cbaf9057cb246b620f455303dccd6ed",
5+
"baseline": "f8be6942c0c5abd48bb325726d57af9ac39e251d",
66
"repository": "https://github.com/microsoft/vcpkg"
77
},
88
"registries": [
@@ -13,8 +13,11 @@
1313
}
1414
],
1515
"overlay-ports": [
16-
"./vcpkg_overlay_ports"
17-
]
16+
"vcpkg/overlay_ports"
17+
],
18+
"overlay-triplets": [
19+
"vcpkg/overlay_triplets"
20+
]
1821
},
1922

2023
"dependencies": [
File renamed without changes.
File renamed without changes.

vcpkg_overlay_ports/boost-asio/increase_pipe_buffer.diff renamed to vcpkg/overlay_ports/boost-asio/increase_pipe_buffer.diff

File renamed without changes.
File renamed without changes.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
set(VCPKG_TARGET_ARCHITECTURE x64)
2+
set(VCPKG_CRT_LINKAGE static)
3+
set(VCPKG_LIBRARY_LINKAGE static)
4+
5+
set(VCPKG_C_FLAGS_RELEASE "/GL")
6+
set(VCPKG_CXX_FLAGS_RELEASE "${VCPKG_C_FLAGS_RELEASE}")
7+
8+
set(VCPKG_C_FLAGS_DEBUG "/fsanitize=address")
9+
set(VCPKG_CXX_FLAGS_DEBUG "${VCPKG_C_FLAGS_DEBUG}")

0 commit comments

Comments
 (0)