diff --git a/appveyor.yml b/appveyor.yml index bba650ad..ff5f9ac8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -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 diff --git a/conanfile.txt b/conanfile.txt new file mode 100644 index 00000000..5349afb7 --- /dev/null +++ b/conanfile.txt @@ -0,0 +1,11 @@ +[requires] +OpenSSL/1.0.2@conan/stable + +[generators] +qmake + +[options] +OpenSSL:shared=True + +[imports] +bin, *.dll -> ./release diff --git a/neuronify.pro b/neuronify.pro index 4d5d30b4..397bdfa0 100644 --- a/neuronify.pro +++ b/neuronify.pro @@ -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 @@ -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