rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Link bundled cmark dynamically on Windows for now

This commit is contained in:
Nicolas Werner 2020-01-26 15:44:56 +01:00
parent e964d90e70
commit 498d8d464c
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -344,7 +344,11 @@ if(USE_BUNDLED_CMARK)
CMAKE_ARGS "CMARK_STATIC=ON CMARK_SHARED=OFF CMARK_TESTS=OFF CMARK_TESTS=OFF" CMAKE_ARGS "CMARK_STATIC=ON CMARK_SHARED=OFF CMARK_TESTS=OFF CMARK_TESTS=OFF"
) )
FetchContent_MakeAvailable(cmark) 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() else()
find_package(cmark REQUIRED) find_package(cmark REQUIRED)
endif() endif()

5
appveyor.yml
View File

@ -41,16 +41,12 @@ build_script:
- echo %INSTVERSION% - echo %INSTVERSION%
- echo %DATE% - echo %DATE%
- dir "C:\OpenSSL-v111-Win64"
- dir "C:\OpenSSL-v111-Win64\lib"
# Build nheko # Build nheko
#- cmake -G "Visual Studio 16 2019" -A x64 -H. -Bbuild #- cmake -G "Visual Studio 16 2019" -A x64 -H. -Bbuild
- cmake -G "Visual Studio 15 2017 Win64" -H. -Bbuild - cmake -G "Visual Studio 15 2017 Win64" -H. -Bbuild
-DHUNTER_ROOT="C:\hunter" -DHUNTER_ROOT="C:\hunter"
-DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF
-DCMAKE_BUILD_TYPE=Release -DHUNTER_CONFIGURATION_TYPES=Release -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 - cmake --build build --config Release
@ -60,6 +56,7 @@ after_build:
- echo %BUILD% - echo %BUILD%
- mkdir NhekoRelease - mkdir NhekoRelease
- copy build\Release\nheko.exe NhekoRelease\nheko.exe - 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 - windeployqt --qmldir %QT_DIR%\qml\ --release NhekoRelease\nheko.exe
- 7z a nheko_win_64.zip .\NhekoRelease\* - 7z a nheko_win_64.zip .\NhekoRelease\*