You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by dk...@apache.org on 2020/05/21 13:52:19 UTC
[avro] branch master updated (5e8537c -> b7948f4)
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/avro.git.
from 5e8537c [AVRO-2486] Don't ignore fwrite error
new 1b1e4ba Fixed building with Visual Studio (and Snappy enabled)
new 258b917 Moved MSBUILD.md to C++ dir
new b7948f4 Added license header
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
lang/c++/CMakeLists.txt | 2 ++
lang/c++/MSBUILD.md | 33 +++++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+)
create mode 100644 lang/c++/MSBUILD.md
[avro] 01/03: Fixed building with Visual Studio (and Snappy enabled)
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/avro.git
commit 1b1e4ba8172c083f65f3e400ab070570a3bb278a
Author: Michael Spector <mi...@microsoft.com>
AuthorDate: Thu Jan 23 12:46:13 2020 +0200
Fixed building with Visual Studio (and Snappy enabled)
---
MSBUILD.md | 16 ++++++++++++++++
lang/c++/CMakeLists.txt | 2 ++
2 files changed, 18 insertions(+)
diff --git a/MSBUILD.md b/MSBUILD.md
new file mode 100644
index 0000000..2f8d942
--- /dev/null
+++ b/MSBUILD.md
@@ -0,0 +1,16 @@
+# Visual Studio 2019 Build Instructions
+
+## Prerequisites
+
+ * Microsoft Visual Studio 2019.
+ * CMake >= 3.12 (should be supplied as part of VS2019 installation).
+ * Clone [https://github.com/spektom/snappy-visual-cpp](https://github.com/spektom/snappy-visual-cpp), and follow build instructions in `README.md`.
+ * Install Boost from [https://netcologne.dl.sourceforge.net/project/boost/boost-binaries/1.68.0/boost_1_68_0-msvc-14.1-64.exe](https://netcologne.dl.sourceforge.net/project/boost/boost-binaries/1.68.0/boost_1_68_0-msvc-14.1-64.exe).
+ * Add `C:\<path to>\boost_1_68_0\lib64-msvc-14.1` to PATH environment variable.
+
+## Building
+
+ cd lang\c++
+ cmake -G "Visual Studio 16 2019" -DBOOST_ROOT=C:\<path to>\boost_1_68_0 -DBOOST_INCLUDEDIR=c:\<path to>\boost_1_68_0\boost -DBOOST_LIBRARYDIR=c:\<path to>\boost_1_68_0\lib64-msvc-14.1 -DSNAPPY_INCLUDE_DIR=C:\<path to>\snappy-visual-cpp -DSNAPPY_LIBRARIES=C:\<path to>\snappy-visual-cpp\x64\Release\snappy.lib ..
+ msbuild Avro-cpp.sln /p:Configuration=Release /p:Platform=x64
+
diff --git a/lang/c++/CMakeLists.txt b/lang/c++/CMakeLists.txt
index ca03f36..69feee5 100644
--- a/lang/c++/CMakeLists.txt
+++ b/lang/c++/CMakeLists.txt
@@ -110,6 +110,7 @@ set_property (TARGET avrocpp
APPEND PROPERTY COMPILE_DEFINITIONS AVRO_DYN_LINK)
add_library (avrocpp_s STATIC ${AVRO_SOURCE_FILES})
+target_include_directories(avrocpp_s PRIVATE ${SNAPPY_INCLUDE_DIR})
set_property (TARGET avrocpp avrocpp_s
APPEND PROPERTY COMPILE_DEFINITIONS AVRO_SOURCE)
@@ -121,6 +122,7 @@ set_target_properties (avrocpp_s PROPERTIES
VERSION ${AVRO_VERSION_MAJOR}.${AVRO_VERSION_MINOR}.${AVRO_VERSION_PATCH})
target_link_libraries (avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES})
+target_include_directories(avrocpp PRIVATE ${SNAPPY_INCLUDE_DIR})
add_executable (precompile test/precompile.cc)
[avro] 02/03: Moved MSBUILD.md to C++ dir
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/avro.git
commit 258b917d5b3e00152d25de8f1a750bbe857afcfc
Author: Michael Spector <mi...@microsoft.com>
AuthorDate: Thu Jan 23 14:00:32 2020 +0200
Moved MSBUILD.md to C++ dir
---
MSBUILD.md => lang/c++/MSBUILD.md | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/MSBUILD.md b/lang/c++/MSBUILD.md
similarity index 100%
rename from MSBUILD.md
rename to lang/c++/MSBUILD.md
[avro] 03/03: Added license header
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/avro.git
commit b7948f40ca3de4edcb1ac1d10bd932b33a2c71d9
Author: Michael Spector <mi...@microsoft.com>
AuthorDate: Mon Jan 27 07:50:43 2020 +0200
Added license header
---
lang/c++/MSBUILD.md | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/lang/c++/MSBUILD.md b/lang/c++/MSBUILD.md
index 2f8d942..11ffd98 100644
--- a/lang/c++/MSBUILD.md
+++ b/lang/c++/MSBUILD.md
@@ -1,3 +1,20 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
# Visual Studio 2019 Build Instructions
## Prerequisites