Skip to content

Commit

Permalink
update for Visual Studio 2019
Browse files Browse the repository at this point in the history
- update VS build files to 2019 and fix the filters
- fix Windows build
  • Loading branch information
sumwale committed May 6, 2021
1 parent 13b00bf commit 56e9641
Show file tree
Hide file tree
Showing 10 changed files with 457 additions and 274 deletions.
17 changes: 11 additions & 6 deletions lib/cpp/3rdparty.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros">
<BOOST_ROOT>$(THIRD_PARTY)\boost\boost_1_47_0</BOOST_ROOT>
<OPENSSL_ROOT_DIR>$(THIRD_PARTY)\openssl\OpenSSL-Win32</OPENSSL_ROOT_DIR>
<LIBEVENT_ROOT>$(THIRD_PARTY)\libevent-2.0.21-stable</LIBEVENT_ROOT>
<BOOST_ROOT>C:\boost-1.76.0</BOOST_ROOT>
<OPENSSL64_ROOT_DIR>C:\openssl-1.1.1k\win64</OPENSSL64_ROOT_DIR>
<OPENSSL32_ROOT_DIR>C:\openssl-1.1.1k\win32</OPENSSL32_ROOT_DIR>
<LIBEVENT_ROOT>C:\libevent-2.0.21</LIBEVENT_ROOT>
</PropertyGroup>
<PropertyGroup />
<ItemDefinitionGroup />
Expand All @@ -13,13 +14,17 @@
<Value>$(BOOST_ROOT)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
<BuildMacro Include="OPENSSL_ROOT_DIR">
<Value>$(OPENSSL_ROOT_DIR)</Value>
<BuildMacro Include="OPENSSL64_ROOT_DIR">
<Value>$(OPENSSL64_ROOT_DIR)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
<BuildMacro Include="OPENSSL32_ROOT_DIR">
<Value>$(OPENSSL32_ROOT_DIR)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
<BuildMacro Include="LIBEVENT_ROOT">
<Value>$(LIBEVENT_ROOT)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
</ItemGroup>
</Project>
</Project>
3 changes: 2 additions & 1 deletion lib/cpp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ you run into problems or want to redirect thrift to build and link against your
own provided third party libraries:

BOOST_ROOT : For boost, e.g. D:\boost_1_55_0
OPENSSL_ROOT_DIR : For OpenSSL, e.g. D:\OpenSSL-Win32
OPENSSL64_ROOT_DIR : For 64-bit OpenSSL, e.g. D:\OpenSSL-Win64
OPENSSL32_ROOT_DIR : For 32-bit OpenSSL, e.g. D:\OpenSSL-Win32

only required by libthriftnb:

Expand Down
173 changes: 114 additions & 59 deletions lib/cpp/libthrift.vcxproj

Large diffs are not rendered by default.

0 comments on commit 56e9641

Please sign in to comment.