From 748e152c95748e7922e70b5b75b82a68d99abd5f Mon Sep 17 00:00:00 2001 From: Jeremy Borgman Date: Sun, 14 Mar 2021 19:58:47 -0500 Subject: [PATCH] testing appveyor change --- appveyor.yml | 2 +- src/CMakeLists.txt | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 166e8cd5..f9062ff0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,7 +17,7 @@ build_script: set "VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC" - set "OPENSSL_ROOT_DIR=C:\OpenSSL-v111-Win64\bin" + set "OPENSSL_ROOT_DIR=C:/OpenSSL-v111-Win64" cmake c:\projects\source -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE:STRING=Release -DENABLE_OPENSSL=ON -DRUN_IN_PLACE=OFF diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b774bfe3..d28ec033 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -290,10 +290,14 @@ if (WIN32) install(DIRECTORY ${CMAKE_BINARY_DIR}/windeployqt_stuff/ DESTINATION bin) + + STRING(REGEX REPLACE "\\\\" "/" OPENSSL_ROOT_DIR $ENV{OPENSSL_ROOT_DIR} ) + if (ENABLE_OPENSSL) - if (EXISTS $ENV{OPENSSL_ROOT_DIR}/bin) - install( - DIRECTORY $ENV{OPENSSL_ROOT_DIR}/bin/ + if (EXISTS ${OPENSSL_ROOT_DIR}/bin) + + install( + DIRECTORY ${OPENSSL_ROOT_DIR}/bin/ DESTINATION bin FILES_MATCHING PATTERN "*.dll")