This is an automated email from the ASF dual-hosted git repository.
phrocker pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/master by this push:
new df13501 MINIFICPP-831 - Remove Debug in favor of RelWithDebInfo and
use Ninja for this target.
df13501 is described below
commit df13501f7de8ac51244095b2cbc7be266c29c30c
Author: Marc Parisi <[email protected]>
AuthorDate: Sun Apr 28 17:07:36 2019 -0400
MINIFICPP-831 - Remove Debug in favor of RelWithDebInfo and use Ninja for
this target.
This closes #548.
Signed-off-by: Marc Parisi <[email protected]>
---
CMakeSettings.json | 36 ++++++++++++++++++++++++------------
1 file changed, 24 insertions(+), 12 deletions(-)
diff --git a/CMakeSettings.json b/CMakeSettings.json
index 2064f29..7582dc5 100644
--- a/CMakeSettings.json
+++ b/CMakeSettings.json
@@ -2,14 +2,14 @@
// See https://go.microsoft.com//fwlink//?linkid=834763 for more information
about this file.
"configurations": [
{
- "name": "x64-Debug",
- "generator": "Visual Studio 14 2015 Win64",
- "configurationType": "Debug",
+ "name": "x64-RelWithDebInfo",
+ "generator": "Ninja",
+ "configurationType": "RelWithDebInfo",
"inheritEnvironments": [ "msvc_x64_x64" ],
"buildRoot":
"${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
"installRoot":
"${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
"cmakeCommandArgs": "",
- "buildCommandArgs": "-v:minimal -m:8",
+ "buildCommandArgs": "-v -j8",
"variables": [
{
"name": "OPENSSL_OFF",
@@ -20,6 +20,10 @@
"value": "ON"
},
{
+ "name": "PORTABLE",
+ "value": "ON"
+ },
+ {
"name": "OPENSSL_ROOT_DIR",
"value": "C:\\OpenSSL-Win64"
},
@@ -28,11 +32,11 @@
"value": "OFF"
},
{
- "name": "USE_SYSTEM_CURL",
- "value": "OFF"
+ "name": "DISABLE_CONTROLLER",
+ "value": "TRUE"
},
{
- "name": "USE_SYSTEM_UUID",
+ "name": "USE_SYSTEM_CURL",
"value": "OFF"
},
{
@@ -40,6 +44,10 @@
"value": "ON"
},
{
+ "name": "USE_SYSTEM_UUID",
+ "value": "OFF"
+ },
+ {
"name": "FORCE_WINDOWS",
"value": "ON"
},
@@ -48,10 +56,6 @@
"value": "FALSE"
},
{
- "name": "ENABLE_COAP",
- "value": "OFF"
- },
- {
"name": "ENABLE_WEL",
"value": "TRUE"
},
@@ -64,6 +68,14 @@
"value": "OFF"
},
{
+ "name": "FORCE_WINDOWS",
+ "value": "ON"
+ },
+ {
+ "name": "ENABLE_COAP",
+ "value": "OFF"
+ },
+ {
"name": "DISABLE_LIBARCHIVE",
"value": "TRUE"
},
@@ -85,7 +97,7 @@
{
"name": "x64-Release",
"generator": "Ninja",
- "configurationType": "RelWithDebInfo",
+ "configurationType": "Release",
"inheritEnvironments": [ "msvc_x64_x64" ],
"buildRoot":
"${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
"installRoot":
"${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
