This is an automated email from the ASF dual-hosted git repository.
aldrin 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 8b2fdf1 MINIFICPP-763: Change import for windows and add travis
targets
8b2fdf1 is described below
commit 8b2fdf1dd48d78733a1e25e65febb8a4fe69b536
Author: Marc Parisi <[email protected]>
AuthorDate: Thu Mar 14 12:26:01 2019 -0400
MINIFICPP-763: Change import for windows and add travis targets
MINIFICPP-763: fix formatting of travis yml
Signed-off-by: Aldrin Piri <[email protected]>
---
.travis.yml | 39 ++++++++++++++++++++++++++++++++++++++-
CMakeLists.txt | 4 ++--
cmake/winssl/FindOpenSSL.cmake | 18 ++++++++++++++++++
3 files changed, 58 insertions(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 69dff4e..8e78ef8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,33 @@ env:
matrix:
include:
- os: linux
+ dist: xenial
+ sudo: required
+ addons:
+ apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ packages:
+ - gcc-4.8
+ - g++-4.8
+ - bison
+ - flex
+ - libboost-all-dev
+ - uuid-dev
+ - doxygen
+ - openssl
+ - libcurl4-openssl-dev
+ - ccache
+ - libpython3.5-dev
+ - liblua5.1-0-dev
+ - libusb-1.0-0-dev
+ - libpng12-dev
+ - libpcap-dev
+ before_install:
+ # Establish updated toolchain as default
+ - sudo unlink /usr/bin/gcc && sudo ln -s /usr/bin/gcc-4.8 /usr/bin/gcc
+ - sudo unlink /usr/bin/g++ && sudo ln -s /usr/bin/g++-4.8 /usr/bin/g++
+ - os: linux
dist: trusty
sudo: required
addons:
@@ -44,7 +71,7 @@ matrix:
- openssl
- libcurl4-openssl-dev
- ccache
- - libpython3.4-dev
+ - libpython3.5-dev
- liblua5.1-0-dev
- libusb-1.0-0-dev
- libpng12-dev
@@ -58,6 +85,16 @@ matrix:
sudo: required
script:
- ./bootstrap.sh -e -t && cd build && cmake -DUSE_SHARED_LIBS= .. &&
make -j2 VERBOSE=1 && sudo make test ARGS="-j2 --output-on-failure"
+ - os: linux
+ dist: xenial
+ sudo: required
+ script:
+ - ./bootstrap.sh -e -t && cd build && cmake -DUSE_SHARED_LIBS= .. &&
make -j2 VERBOSE=1 && sudo make test ARGS="-j2 --output-on-failure"
+ - os: linux
+ dist: xenial
+ sudo: required
+ script:
+ - ./bootstrap.sh -e -t && cd build && cmake -DUSE_SHARED_LIBS=ON ..
&& make -j2 VERBOSE=1 && sudo make test ARGS="-j2 --output-on-failure"
- os: osx
osx_image: xcode8.3
env:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d3a5ae..e2956fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,7 +182,7 @@ endif()
# Provide custom modules for the project
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-if (OPENSSL_OFF STREQUAL "OFF")
+if (NOT OPENSSL_OFF)
if(USE_SYSTEM_OPENSSL)
# Set the right openssl root path
@@ -247,7 +247,7 @@ else ()
message( FATAL_ERROR "OpenSSL was not found. Please install OpenSSL" )
endif (OPENSSL_FOUND)
else()
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/ssl")
+ list(APPEND CMAKE_MODULE_PATH
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/winssl")
endif()
if(WIN32 OR NOT USE_SYSTEM_ZLIB)
message("Using bundled zlib")
diff --git a/cmake/winssl/FindOpenSSL.cmake b/cmake/winssl/FindOpenSSL.cmake
new file mode 100644
index 0000000..1830efa
--- /dev/null
+++ b/cmake/winssl/FindOpenSSL.cmake
@@ -0,0 +1,18 @@
+# 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
+#
+# http://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.
+
+# Dummy OpenSSL find for when we use bundled version
\ No newline at end of file
