From 498d8d464c747475f012b4aee588caee11d8468a Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sun, 26 Jan 2020 15:44:56 +0100 Subject: [PATCH] Link bundled cmark dynamically on Windows for now --- CMakeLists.txt | 6 +++++- appveyor.yml | 5 +---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 441d7327..694b3701 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -344,7 +344,11 @@ if(USE_BUNDLED_CMARK) CMAKE_ARGS "CMARK_STATIC=ON CMARK_SHARED=OFF CMARK_TESTS=OFF CMARK_TESTS=OFF" ) FetchContent_MakeAvailable(cmark) - add_library(cmark::cmark ALIAS libcmark_static) + if (MSVC) + add_library(cmark::cmark ALIAS libcmark) + else() + add_library(cmark::cmark ALIAS libcmark_static) + endif() else() find_package(cmark REQUIRED) endif() diff --git a/appveyor.yml b/appveyor.yml index 8781f42a..78b57139 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -41,16 +41,12 @@ build_script: - echo %INSTVERSION% - echo %DATE% - - dir "C:\OpenSSL-v111-Win64" - - dir "C:\OpenSSL-v111-Win64\lib" - # Build nheko #- cmake -G "Visual Studio 16 2019" -A x64 -H. -Bbuild - cmake -G "Visual Studio 15 2017 Win64" -H. -Bbuild -DHUNTER_ROOT="C:\hunter" -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DHUNTER_CONFIGURATION_TYPES=Release - #-DUSE_BUNDLED_OPENSSL=OFF #-DOPENSSL_ROOT_DIR="C:\OpenSSL-v11-Win64" -DOPENSSL_INCLUDE_DIR="C:\OpenSSL-v11-Win64\include" -DOPENSSL_LIBRARIES="C:\OpenSSL-v11-Win64\lib" - cmake --build build --config Release @@ -60,6 +56,7 @@ after_build: - echo %BUILD% - mkdir NhekoRelease - copy build\Release\nheko.exe NhekoRelease\nheko.exe + - copy build\_deps\cmark-build\src\Release\cmark.dll NhekoRelease\cmark.dll - windeployqt --qmldir %QT_DIR%\qml\ --release NhekoRelease\nheko.exe - 7z a nheko_win_64.zip .\NhekoRelease\*