This is an automated email from the ASF dual-hosted git repository.
aboda pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/main by this push:
new a2e8068 MINIFICPP-1511 - Update documentation with Visual Studio 2019
a2e8068 is described below
commit a2e80689889b41809c6110e47a87ee9c987622f1
Author: Adam Debreceni <[email protected]>
AuthorDate: Thu Feb 25 15:46:22 2021 +0100
MINIFICPP-1511 - Update documentation with Visual Studio 2019
Signed-off-by: Arpad Boda <[email protected]>
This closes #1016
---
README.md | 4 ++--
Windows.md | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index 28d39d1..cc8f421 100644
--- a/README.md
+++ b/README.md
@@ -192,8 +192,8 @@ On all distributions please use -DUSE_SHARED_LIBS=OFF to
statically link zlib, l
below.
#### Windows
- Build and Installation has been tested with Windows 10 using Visual Studio
2017. You can build
- and create an MSI via the CPACK command. This requires the installation of
the WiX
+ Build and Installation has been tested with Windows 10 using Visual Studio
2017 and Visual Studio 2019.
+ You can build and create an MSI via the CPACK command. This requires the
installation of the WiX
toolset (http://wixtoolset.org/). To do this, open up a prompt into your
build directory and
type 'cpack' . The CPACK command will automatically generate and provide you
a path to the distributable
msi file. See [Windows.md](Windows.md) for more details.
diff --git a/Windows.md b/Windows.md
index ab58abb..7e5223b 100644
--- a/Windows.md
+++ b/Windows.md
@@ -18,13 +18,13 @@
## Requirements
Apache NiFi MiNiFi C++ has been built on Window Server 2016, 2019, and Windows
10 operating systems. The project is CMake focused we suggest building via
-Visual Studio 2017 or our `win_build_vs.bat` script.
+Visual Studio 2017, Visual Studio 2019 or our `win_build_vs.bat` script.
The project previously required OpenSSL to be installed. If you follow our
build procedures, below, you will not need to install that dependency.
### Required software
- - Visual Studio 2017
+ - Visual Studio 2017 or Visual Studio 2019
- [CMake](https://cmake.org/download/)
- [Git](https://git-scm.com/download/win)
- (Optional) [WiX Toolset](https://wixtoolset.org/releases/) (only for
building the MSI)
@@ -68,12 +68,14 @@ After the build directory it will take optional parameters
modifying the CMake c
| /D | Builds RelWithDebInfo build instead of Release |
| /DD | Builds Debug build instead of Release |
| /CI | Sets STRICT_GSL_CHECKS to AUDIT |
+| /2019 | Use the Visual Studio 2019 environment instead of the default Visual
Studio 2017 |
Examples:
- 32-bit build with kafka, disabling tests, enabling MSI creation:
`win_build_vs.bat build32 /T /K /P`
- 64-bit build with JNI, with debug symbols: `win_build_vs.bat build64 /64 /J
/D`
-`win_build_vs.bat` requires a Visual Studio 2017 build environment to be set
up. For 32-bit builds this can be achieved by using the `x86 Native Tools
Command Prompt for VS 2017`, for 64-bit builds by using the `x64 Native Tools
Command Prompt for VS 2017`.
+`win_build_vs.bat` requires either a Visual Studio 2017 or a Visual Studio
2019 (if called with the `/2019` flag) build environment to be set up. With
Visual Studio 2017 use the `x86 Native Tools Command Prompt for VS 2017` for
32-bit, or the `x64 Native Tools Command Prompt for VS 2017` for 64-bit builds.
+For Visual Studio 2019 use the `x86 Native Tools Command Prompt for VS 2019`,
or the `x64 Native Tools Command Prompt for VS 2019` for 32-bit and 64-bit
builds respectively.
## Building directly with CMake
