Skip to content

Commit 59052d9

Browse files
evoskuilevoskuil
authored
Merge pull request #1148 from pmienk/calculated_patch
Generated version.hpp
2 parents 726f598 + 5b69a67 commit 59052d9

16 files changed

Lines changed: 314 additions & 31 deletions

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ builds/gnu/.dirstamp
3434
# pkg-config pc file from .pc.in
3535
builds/gnu/*.pc
3636

37+
# configured headers from in-tree configure
38+
builds/gnu/include
39+
3740
# msbuild/msvc
3841
/.vs
3942
*.db

‎builds/cmake/CMakeLists.txt‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ find_package(Git QUIET)
1111
set( GIT_COMMIT_HASH "unknown" )
1212
set( GIT_COMMIT_HEIGHT 0 )
1313
set( GIT_DIRTY 0 )
14-
set( GIT_ORIGIN_URL "https://github.com/libbitcoin/libbitcoin-node" )
14+
set( GIT_ORIGIN_URL "unknown" )
1515

1616
if ( GIT_EXECUTABLE )
1717
execute_process(
@@ -21,6 +21,10 @@ if ( GIT_EXECUTABLE )
2121
OUTPUT_STRIP_TRAILING_WHITESPACE
2222
ERROR_QUIET )
2323

24+
if ( NOT GIT_COMMIT_HASH )
25+
set( GIT_COMMIT_HASH "unknown" )
26+
endif()
27+
2428
execute_process(
2529
COMMAND ${GIT_EXECUTABLE} rev-list --count HEAD
2630
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -33,12 +37,16 @@ if ( GIT_EXECUTABLE )
3337
endif()
3438

3539
execute_process(
36-
COMMAND ${GIT_EXECUTABLE} remote get-url origin
40+
COMMAND ${GIT_EXECUTABLE} ls-remote --get-url
3741
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
3842
OUTPUT_VARIABLE GIT_ORIGIN_URL
3943
OUTPUT_STRIP_TRAILING_WHITESPACE
4044
ERROR_QUIET )
4145

46+
if ( NOT GIT_ORIGIN_URL MATCHES "://|@" )
47+
set( GIT_ORIGIN_URL "unknown" )
48+
endif()
49+
4250
execute_process(
4351
COMMAND ${GIT_EXECUTABLE} status --porcelain
4452
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -171,6 +179,15 @@ endif()
171179
#------------------------------------------------------------------------------
172180
include(CheckLinkerFlag)
173181

182+
#------------------------------------------------------------------------------
183+
# Configurable file(s).
184+
#------------------------------------------------------------------------------
185+
186+
configure_file(
187+
${CMAKE_CURRENT_SOURCE_DIR}/../../include/bitcoin/node/version.hpp.in
188+
${CMAKE_CURRENT_BINARY_DIR}/include/bitcoin/node/version.hpp
189+
@ONLY )
190+
174191
#------------------------------------------------------------------------------
175192
# libbitcoin-node library
176193
#------------------------------------------------------------------------------
@@ -212,6 +229,10 @@ target_sources( libbitcoin-node
212229
BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/../../include"
213230
FILES
214231
${libbitcoin_node_HEADERS}
232+
FILE_SET HEADERS
233+
BASE_DIRS "${CMAKE_CURRENT_BINARY_DIR}/include"
234+
FILES
235+
"${CMAKE_CURRENT_BINARY_DIR}/include/bitcoin/node/version.hpp"
215236
PRIVATE
216237
${libbitcoin_node_SOURCES}
217238
)

‎builds/gnu/Makefile.am‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ lib_LTLIBRARIES = src/libbitcoin-node.la
3737
src_libbitcoin_node_la_LIBS = src/libbitcoin-node.la
3838

3939
src_libbitcoin_node_la_CPPFLAGS = \
40+
-I${top_builddir}/include \
4041
-I${srcdir}/../../include \
4142
${libbitcoin_database_BUILD_CPPFLAGS} \
4243
${libbitcoin_network_BUILD_CPPFLAGS}
@@ -115,7 +116,7 @@ include_bitcoin_node_HEADERS = \
115116
${srcdir}/../../include/bitcoin/node/events.hpp \
116117
${srcdir}/../../include/bitcoin/node/full_node.hpp \
117118
${srcdir}/../../include/bitcoin/node/settings.hpp \
118-
${srcdir}/../../include/bitcoin/node/version.hpp
119+
include/bitcoin/node/version.hpp
119120

120121
include_bitcoin_node_channelsdir = \
121122
${includedir}/bitcoin/node/channels

‎builds/gnu/configure.ac‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ m4_define([_git_dirty],
2424
m4_define([_GIT_DIRTY], m4_ifnblank(_git_dirty, [_git_dirty], [0]))
2525

2626
m4_define([_GIT_ORIGIN_URL],
27-
m4_dquote(m4_esyscmd_s([git remote get-url origin 2>/dev/null || echo https://github.com/libbitcoin/libbitcoin-node])))
27+
m4_dquote(m4_esyscmd_s([git ls-remote --get-url 2>/dev/null | grep -e '://' -e '@' || echo unknown])))
2828

2929
m4_define([_LIBBITCOIN_VERSION_MAJOR], [4])
3030
m4_define([_LIBBITCOIN_VERSION_MINOR], [0])
@@ -296,6 +296,7 @@ AS_IF([(test "x${with_tests}" != "xno")],
296296
AC_CONFIG_FILES([
297297
Makefile
298298
libbitcoin-node.pc
299+
include/bitcoin/node/version.hpp:${repository_root_dir}/include/bitcoin/node/version.hpp.in
299300
])
300301

301302
AC_OUTPUT

‎builds/msvc/properties/Git.props‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<PropertyGroup>
5+
<_PropertySheetDisplayName>Git Settings</_PropertySheetDisplayName>
6+
</PropertyGroup>
7+
8+
<!-- Substitutes @TOKEN@ values into each ConfigurableFile, writing %(Generated) only when its content changes. -->
9+
<Target Name="ConfigureFiles" BeforeTargets="ClCompile;ResourceCompile" Inputs="%(ConfigurableFile.Identity)" Outputs="%(ConfigurableFile.Generated)">
10+
11+
<Exec Command="git -C &quot;$(RepoRoot).&quot; rev-parse HEAD 2&gt;nul" Condition="'$(GitCommitHash)' == ''" ConsoleToMSBuild="true" EchoOff="true" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="true" StandardOutputImportance="low">
12+
<Output TaskParameter="ConsoleOutput" PropertyName="GitCommitHash" />
13+
</Exec>
14+
<Exec Command="git -C &quot;$(RepoRoot).&quot; rev-list --count HEAD 2&gt;nul" Condition="'$(GitCommitHeight)' == ''" ConsoleToMSBuild="true" EchoOff="true" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="true" StandardOutputImportance="low">
15+
<Output TaskParameter="ConsoleOutput" PropertyName="GitCommitHeight" />
16+
</Exec>
17+
<Exec Command="git -C &quot;$(RepoRoot).&quot; status --porcelain 2&gt;nul" Condition="'$(GitDirty)' == ''" ConsoleToMSBuild="true" EchoOff="true" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="true" StandardOutputImportance="low">
18+
<Output TaskParameter="ConsoleOutput" PropertyName="_GitStatus" />
19+
</Exec>
20+
<Exec Command="git -C &quot;$(RepoRoot).&quot; ls-remote --get-url 2&gt;nul" Condition="'$(GitOriginUrl)' == ''" ConsoleToMSBuild="true" EchoOff="true" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="true" StandardOutputImportance="low">
21+
<Output TaskParameter="ConsoleOutput" PropertyName="GitOriginUrl" />
22+
</Exec>
23+
24+
<PropertyGroup>
25+
<GitCommitHash Condition="!$([System.Text.RegularExpressions.Regex]::IsMatch('$(GitCommitHash)', '^[0-9a-f]{40}$'))">unknown</GitCommitHash>
26+
<GitCommitHeight Condition="!$([System.Text.RegularExpressions.Regex]::IsMatch('$(GitCommitHeight)', '^[0-9]+$'))">0</GitCommitHeight>
27+
<GitDirty Condition="'$(GitDirty)' == '' And '$(_GitStatus)' != ''">1</GitDirty>
28+
<GitDirty Condition="'$(GitDirty)' == ''">0</GitDirty>
29+
<GitOriginUrl Condition="!$([System.Text.RegularExpressions.Regex]::IsMatch('$(GitOriginUrl)', '^(https?|ssh|git)://[^;\s]+$|^[^@;\s]+@[^:;\s]+:[^;\s]+$'))">unknown</GitOriginUrl>
30+
<VersionPatch Condition="'$(VersionPatch)' == ''">$(GitCommitHeight)</VersionPatch>
31+
</PropertyGroup>
32+
33+
<PropertyGroup>
34+
<_Configured>$([System.IO.File]::ReadAllText('%(ConfigurableFile.FullPath)'))</_Configured>
35+
<_Configured>$(_Configured.Replace('@LIBBITCOIN_VERSION_MAJOR@', '$(VersionMajor)'))</_Configured>
36+
<_Configured>$(_Configured.Replace('@LIBBITCOIN_VERSION_MINOR@', '$(VersionMinor)'))</_Configured>
37+
<_Configured>$(_Configured.Replace('@LIBBITCOIN_VERSION_PATCH@', '$(VersionPatch)'))</_Configured>
38+
<_Configured>$(_Configured.Replace('@GIT_COMMIT_HASH@', '$(GitCommitHash)'))</_Configured>
39+
<_Configured>$(_Configured.Replace('@GIT_ORIGIN_URL@', '$(GitOriginUrl)'))</_Configured>
40+
<_Configured>$(_Configured.Replace('@GIT_DIRTY@', '$(GitDirty)'))</_Configured>
41+
</PropertyGroup>
42+
43+
<MakeDir Directories="$([System.IO.Path]::GetDirectoryName('%(ConfigurableFile.Generated)'))" />
44+
<WriteLinesToFile File="%(ConfigurableFile.Generated)" Lines="$([MSBuild]::Escape($(_Configured.TrimEnd())))" Overwrite="true" WriteOnlyWhenDifferent="true" />
45+
<Message Text="Configured : %(ConfigurableFile.Generated)" Importance="high" />
46+
</Target>
47+
48+
<Target Name="CleanConfiguredFiles" AfterTargets="Clean">
49+
<Delete Files="@(ConfigurableFile->'%(Generated)')" />
50+
</Target>
51+
52+
</Project>

‎builds/msvc/properties/GitSubstitute.ps1‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
# GitSubstitute.ps1
2+
# Substitutes @TOKEN@ placeholders in a template (.in) file using values passed from MSBuild.
3+
# Intended to be invoked by GitSubstitution.props.
4+
5+
[CmdletBinding()]
6+
param(
7+
[Parameter(Mandatory = $true)]
8+
[string] $InputPath,
9+
10+
[Parameter(Mandatory = $true)]
11+
[string] $OutputPath,
12+
13+
[Parameter(Mandatory = $true)]
14+
[string] $VersionMajorToken,
15+
16+
[Parameter(Mandatory = $true)]
17+
[string] $VersionMinorToken,
18+
19+
[Parameter(Mandatory = $true)]
20+
[string] $VersionPatchToken,
21+
22+
[Parameter(Mandatory = $true)]
23+
[string] $GitCommitHashToken,
24+
25+
[Parameter(Mandatory = $true)]
26+
[string] $GitOriginUrlToken,
27+
28+
[Parameter(Mandatory = $true)]
29+
[string] $GitDirtyToken,
30+
31+
[Parameter(Mandatory = $true)]
32+
[string] $VersionMajorValue,
33+
34+
[Parameter(Mandatory = $true)]
35+
[string] $VersionMinorValue,
36+
37+
[Parameter(Mandatory = $true)]
38+
[string] $VersionPatchValue,
39+
40+
[Parameter(Mandatory = $true)]
41+
[AllowEmptyString()]
42+
[string] $GitCommitHash,
43+
44+
[Parameter(Mandatory = $true)]
45+
[AllowEmptyString()]
46+
[string] $GitOriginUrl,
47+
48+
[Parameter(Mandatory = $true)]
49+
[string] $GitDirty
50+
)
51+
52+
$ErrorActionPreference = 'Stop'
53+
54+
function Escape-RegexLiteral {
55+
param([string] $Text)
56+
return [regex]::Escape($Text)
57+
}
58+
59+
if (-not (Test-Path -LiteralPath $InputPath)) {
60+
throw "Input template not found: $InputPath"
61+
}
62+
63+
$outDir = Split-Path -Parent $OutputPath
64+
if ($outDir -and -not (Test-Path -LiteralPath $outDir)) {
65+
New-Item -ItemType Directory -Path $outDir -Force | Out-Null
66+
}
67+
68+
$content = Get-Content -LiteralPath $InputPath -Raw
69+
70+
# -replace treats the pattern as regex; escape tokens so '@...@' is matched literally.
71+
$replacements = @(
72+
@{ Token = $VersionMajorToken; Value = $VersionMajorValue }
73+
@{ Token = $VersionMinorToken; Value = $VersionMinorValue }
74+
@{ Token = $VersionPatchToken; Value = $VersionPatchValue }
75+
@{ Token = $GitCommitHashToken; Value = $GitCommitHash }
76+
@{ Token = $GitOriginUrlToken; Value = $GitOriginUrl }
77+
@{ Token = $GitDirtyToken; Value = $GitDirty }
78+
)
79+
80+
foreach ($r in $replacements) {
81+
$pattern = '@' + (Escape-RegexLiteral $r.Token) + '@'
82+
# Replacement string: use MatchEvaluator so $ and other specials in values stay literal.
83+
$content = [regex]::Replace($content, $pattern, { param($m) $r.Value })
84+
}
85+
86+
# -NoNewline matches the previous inline script behavior.
87+
Set-Content -LiteralPath $OutputPath -Value $content -NoNewline -Encoding utf8
88+
89+
Write-Host "Generated: $OutputPath"

‎builds/msvc/properties/GitSubstitution.props‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<PropertyGroup>
5+
<_PropertySheetDisplayName>Git Substitution (ConfigurableFile)</_PropertySheetDisplayName>
6+
7+
<!-- Output root for generated headers (overridable from vcxproj) -->
8+
<GeneratedIncludeDir Condition="'$(GeneratedIncludeDir)' == ''">$(IntDir)generated\include\</GeneratedIncludeDir>
9+
10+
<!-- @TOKEN@ names in .in files (overridable from vcxproj) -->
11+
<VersionMajorToken Condition="'$(VersionMajorToken)' == ''">LIBBITCOIN_VERSION_MAJOR</VersionMajorToken>
12+
<VersionMinorToken Condition="'$(VersionMinorToken)' == ''">LIBBITCOIN_VERSION_MINOR</VersionMinorToken>
13+
<VersionPatchToken Condition="'$(VersionPatchToken)' == ''">LIBBITCOIN_VERSION_PATCH</VersionPatchToken>
14+
<GitCommitHashToken Condition="'$(GitCommitHashToken)' == ''">GIT_COMMIT_HASH</GitCommitHashToken>
15+
<GitOriginUrlToken Condition="'$(GitOriginUrlToken)' == ''">GIT_ORIGIN_URL</GitOriginUrlToken>
16+
<GitDirtyToken Condition="'$(GitDirtyToken)' == ''">GIT_DIRTY</GitDirtyToken>
17+
18+
<!-- Substituted values (overridable from vcxproj; patch filled in target if still empty) -->
19+
<VersionMajorValue Condition="'$(VersionMajorValue)' == ''">4</VersionMajorValue>
20+
<VersionMinorValue Condition="'$(VersionMinorValue)' == ''">0</VersionMinorValue>
21+
</PropertyGroup>
22+
23+
<!-- Prepend generated include dir unless disabled by caller -->
24+
<ItemDefinitionGroup Condition="'$(GitSubstitutionAddIncludeDir)' != 'false'">
25+
<ClCompile>
26+
<AdditionalIncludeDirectories>
27+
$(GeneratedIncludeDir);%(AdditionalIncludeDirectories)
28+
</AdditionalIncludeDirectories>
29+
</ClCompile>
30+
</ItemDefinitionGroup>
31+
32+
<Target Name="GenerateConfiguredHeaders"
33+
BeforeTargets="ClCompile"
34+
Condition="'@(ConfigurableFile)' != ''"
35+
Inputs="%(ConfigurableFile.FileInput)"
36+
Outputs="%(ConfigurableFile.FileOutput)">
37+
38+
<!-- Resolve RepoRoot; fall back to empty if unset so git -C still runs safely -->
39+
<PropertyGroup>
40+
<_GitRepoRoot Condition="'$(RepoRoot)' != ''">$([System.IO.Path]::GetFullPath('$(RepoRoot)').TrimEnd('\'))</_GitRepoRoot>
41+
<_GitRepoRoot Condition="'$(RepoRoot)' == ''">.</_GitRepoRoot>
42+
</PropertyGroup>
43+
44+
<Exec Command="git -C &quot;$(_GitRepoRoot)&quot; rev-parse HEAD"
45+
ConsoleToMSBuild="true"
46+
IgnoreExitCode="true"
47+
StandardOutputImportance="low"
48+
Condition="'$(GitCommitHash)' == ''">
49+
<Output TaskParameter="ConsoleOutput" PropertyName="GitCommitHash" />
50+
<Output TaskParameter="ExitCode" PropertyName="_GitRevParseExit" />
51+
</Exec>
52+
53+
<Exec Command="git -C &quot;$(_GitRepoRoot)&quot; rev-list --count HEAD"
54+
ConsoleToMSBuild="true"
55+
IgnoreExitCode="true"
56+
StandardOutputImportance="low"
57+
Condition="'$(GitCommitHeight)' == ''">
58+
<Output TaskParameter="ConsoleOutput" PropertyName="GitCommitHeight" />
59+
</Exec>
60+
61+
<Exec Command="git -C &quot;$(_GitRepoRoot)&quot; remote get-url origin"
62+
ConsoleToMSBuild="true"
63+
IgnoreExitCode="true"
64+
StandardOutputImportance="low"
65+
Condition="'$(GitOriginUrl)' == ''">
66+
<Output TaskParameter="ConsoleOutput" PropertyName="GitOriginUrl" />
67+
</Exec>
68+
69+
<Exec Command="git -C &quot;$(_GitRepoRoot)&quot; status --porcelain"
70+
ConsoleToMSBuild="true"
71+
IgnoreExitCode="true"
72+
StandardOutputImportance="low"
73+
Condition="'$(GitDirty)' == ''">
74+
<Output TaskParameter="ConsoleOutput" PropertyName="GitStatus" />
75+
</Exec>
76+
77+
<!-- Sanitize git outputs: reject multi-line / non-hash / empty results from failed git -->
78+
<PropertyGroup>
79+
<!-- Commit hash: keep only a plausible single-line hex hash; else unknown -->
80+
<GitCommitHash Condition="'$(GitCommitHash)' == '' or $(GitCommitHash.Contains($([System.Environment]::NewLine))) or $(GitCommitHash.Contains(' '))">unknown</GitCommitHash>
81+
<GitCommitHash Condition="'$(GitCommitHash)' == ''">unknown</GitCommitHash>
82+
83+
<!-- Height: digits only; else 0 -->
84+
<GitCommitHeight Condition="'$(GitCommitHeight)' == '' or $([System.Text.RegularExpressions.Regex]::IsMatch('$(GitCommitHeight)', '[^0-9]'))">0</GitCommitHeight>
85+
<GitCommitHeight Condition="'$(GitCommitHeight)' == ''">0</GitCommitHeight>
86+
87+
<!-- Origin URL: clear if it looks like an error message -->
88+
<GitOriginUrl Condition="$(GitOriginUrl.Contains('fatal:')) or $(GitOriginUrl.Contains('error:'))"></GitOriginUrl>
89+
<GitOriginUrl Condition="'$(GitOriginUrl)' == ''"></GitOriginUrl>
90+
91+
<!-- Dirty: any non-empty porcelain status => 1 -->
92+
<GitDirty Condition="'$(GitStatus)' != '' and !$(GitStatus.Contains('fatal:'))">1</GitDirty>
93+
<GitDirty Condition="'$(GitDirty)' == ''">0</GitDirty>
94+
95+
<VersionPatchValue Condition="'$(VersionPatchValue)' == ''">$(GitCommitHeight)</VersionPatchValue>
96+
</PropertyGroup>
97+
98+
<MakeDir Directories="$([System.IO.Path]::GetDirectoryName('%(ConfigurableFile.FileOutput)'))" />
99+
100+
<!-- Invoke external script; values passed as discrete arguments (avoids cmd/PowerShell quoting bugs) -->
101+
<Exec Command="powershell -NoProfile -ExecutionPolicy Bypass -File &quot;$(MSBuildThisFileDirectory)GitSubstitute.ps1&quot; -InputPath &quot;%(ConfigurableFile.FileInput)&quot; -OutputPath &quot;%(ConfigurableFile.FileOutput)&quot; -VersionMajorToken &quot;$(VersionMajorToken)&quot; -VersionMinorToken &quot;$(VersionMinorToken)&quot; -VersionPatchToken &quot;$(VersionPatchToken)&quot; -GitCommitHashToken &quot;$(GitCommitHashToken)&quot; -GitOriginUrlToken &quot;$(GitOriginUrlToken)&quot; -GitDirtyToken &quot;$(GitDirtyToken)&quot; -VersionMajorValue &quot;$(VersionMajorValue)&quot; -VersionMinorValue &quot;$(VersionMinorValue)&quot; -VersionPatchValue &quot;$(VersionPatchValue)&quot; -GitCommitHash &quot;$(GitCommitHash)&quot; -GitOriginUrl &quot;$(GitOriginUrl)&quot; -GitDirty &quot;$(GitDirty)&quot;" />
102+
</Target>
103+
104+
</Project>

‎builds/msvc/properties/Output.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
<ImportGroup Label="PropertySheets">
2727
<Import Project="Messages.props" />
28+
<Import Project="Git.props" />
2829
</ImportGroup>
2930

3031
</Project>

‎builds/msvc/vs2026/libbitcoin-database.import.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<ItemDefinitionGroup>
1717
<ClCompile>
1818
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-database\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
19+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-database\build\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1920
<PreprocessorDefinitions Condition="'$(Linkage-libbitcoin-database)' == 'static' Or '$(Linkage-libbitcoin-database)' == 'ltcg'">BCD_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
2021
</ClCompile>
2122
<Link>
@@ -32,4 +33,4 @@
3233
</AdditionalLibraryDirectories>
3334
</Link>
3435
</ItemDefinitionGroup>
35-
</Project>
36+
</Project>

‎builds/msvc/vs2026/libbitcoin-network.import.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<ItemDefinitionGroup>
2929
<ClCompile>
3030
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-network\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
31+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-network\build\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
3132

3233
<!-- Prevent boost from seeing ssl includes when ssl is deselected (requires external headers). -->
3334
<AdditionalIncludeDirectories Condition="'$(Option-ssl)' == 'true'">$(ProjectDir)..\..\..\..\..\libbitcoin-network\include\bitcoin\network\ssl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -59,4 +60,4 @@
5960
</ItemGroup>
6061
</Target>
6162

62-
</Project>
63+
</Project>

0 commit comments

Comments
 (0)