Skip to content

Commit

Permalink
Make OpenSSL dependency through conan.io on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
dragly committed Feb 5, 2018
1 parent 81abc49 commit 1e97c8e
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 1 deletion.
4 changes: 4 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ install:
- set QTDIR=C:\Qt\5.9\msvc2015_64
- set PATH=%PATH%;%QTDIR%\bin;C:\Qt\QtIFW2.0.1\bin
- call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
- cmd: pip.exe install conan
- cmd: conan user
- cmd: conan --version
build_script:
- conan install . -s compiler="Visual Studio" -s compiler.version=14
- git submodule update --init --recursive
- qmake neuronify.pro
- nmake
Expand Down
11 changes: 11 additions & 0 deletions conanfile.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[requires]
OpenSSL/1.0.2@conan/stable

[generators]
qmake

[options]
OpenSSL:shared=True

[imports]
bin, *.dll -> ./release
8 changes: 7 additions & 1 deletion neuronify.pro
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ DISTFILES += \
installer/packages/net.ovilab.neuronify/data/README.txt \
.travis.yml \
qml/backend/qmldir \
.travis/Dockerfile
.travis/Dockerfile \
conanfile.txt

ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android

Expand Down Expand Up @@ -139,6 +140,11 @@ macx {
macos/macos.plist
}

win32 {
CONFIG += conan_basic_setup
include(conanbuildinfo.pri)
}

WINRT_MANIFEST.name = Neuronify
WINRT_MANIFEST.background = $${LITERAL_HASH}399cdd
WINRT_MANIFEST.publisher = Ovilab
Expand Down

0 comments on commit 1e97c8e

Please sign in to comment.