From 3a480a3fb9c8ab9943d47239ad21df2ed9a87eb7 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 01 12月 2019 20:24:04 +0800
Subject: [PATCH] mingw cross compile add openssl
---
.travis.yml | 10 +++++-----
CMakeLists.txt | 6 ++++--
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 73c2fab..f65caa3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -107,6 +107,7 @@
- wine64-development-preloader
- wine-development
- wine64
+ - p7zip-full
before_script:
- cd build
- wget -c https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2
@@ -114,12 +115,11 @@
- sudo ln -s /usr/bin/x86_64-w64-mingw32-g++ /usr/local/bin/g++-mingw
- cd boost_1_71_0
- ./bootstrap.sh
- - travis_wait 30 ./b2 toolset=gcc-mingw target-os=windows address-model=64 --with-date_time --with-test --with-filesystem --with-program_options --with-regex --with-serialization --with-system runtime-link=static --prefix=./dist release install
+ - travis_wait 30 ./b2 toolset=gcc-mingw target-os=windows address-model=64 --with-date_time --with-test --with-filesystem --with-program_options --with-regex --with-serialization --with-system runtime-link=static --layout=tagged --prefix=./dist release install
- cd ..
- - cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-ubuntu-mingw64.cmake -DCMAKE_INSTALL_PREFIX=../../install -DBOOST_ROOT=$PWD/boost_1_71_0/dist ..
- script:
- - cmake --build . --target install --config Release
- #disabling tests for now. Need to compile and install openssl...
+ - wget --no-check-certificate https://bintray.com/vszakats/generic/download_file?file_path=openssl-1.0.2h-win64-mingw.7z -O openssl.7z
+ - 7z x openssl.7z
+ - cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-ubuntu-mingw64.cmake -DCMAKE_INSTALL_PREFIX=../../install -DBOOST_ROOT=$PWD/boost_1_71_0/dist -DOPENSSL_ROOT_DIR=$PWD/openssl-1.0.2h-win64-mingw/ ..
- os: windows
name: "Widnows server 1803 - Visual Studio 15 2017 Win64 - (/MD)"
before_script:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index acd00fb..70fb867 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,12 +62,14 @@
IF(OPENSSL_FOUND)
add_definitions(-DHAS_OPENSSL)
include_directories(${OPENSSL_INCLUDE_DIR})
- MESSAGE(STATUS "Found openssl version ${OPENSSL_VERSION} ")
+ MESSAGE(STATUS "Found openssl version ${OPENSSL_VERSION}")
+ELSE(OPENSSL_FOUND)
+ MESSAGE(STATUS "OpenSSL not found")
ENDIF(OPENSSL_FOUND)
if(UNIX) #this is true for all the linux systems but not for cross compiling "linux->windows"
IF(NOT OPENSSL_FOUND)
- MESSAGE(SEND_ERROR "Openssl not found - required in Linux")
+ MESSAGE(SEND_ERROR "Openssl required in Linux, please install it or specify -DOPENSSL_ROOT")
ENDIF(NOT OPENSSL_FOUND)
find_package(Threads)
--
Gitblit v1.9.1