StarMirror/xlnt
1
0
Fork 0
mirror of https://github.com/tfussell/xlnt.git synced 2024-03-22 13:11:17 +08:00
Code Issues Projects Releases Wiki Activity

specify cryptopp library name for appveyor

Browse Source
This commit is contained in:
Thomas Fussell 2017-03-11 11:15:35 -05:00
parent 5f9ab3a5f7
commit 3b35dbb901
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.appveyor.yml
View File

@ -19,11 +19,10 @@ install:
- powershell -exec bypass scripts\bootstrap.ps1 - powershell -exec bypass scripts\bootstrap.ps1
- vcpkg install cryptopp zlib expat - vcpkg install cryptopp zlib expat
- vcpkg integrate install - vcpkg integrate install
- dir installed\x86-windows\lib
- cd .. - cd ..
before_build: before_build:
- cmake -H. -Bbuild -G"Visual Studio 14 2015" -DSTATIC=%STATIC% -DSAMPLES=ON -DBENCHMARKS=ON -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake - vcpkg/downloads/cmake-3.8.0-rc1-win32-x86/bin/cmake.exe -H. -Bbuild -G"Visual Studio 14 2015" -DSTATIC=%STATIC% -DSAMPLES=ON -DBENCHMARKS=ON -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_ROOT=vcpkg/downloads/cmake-3.8.0-rc1-win32-x86 -DCRYPTOPP_LIBRARY=vcpkg/installed/x86-windows/lib/cryptopp-static.lib
build: build:
project: build/tests/xlnt.test.sln project: build/tests/xlnt.test.sln

4
tests/CMakeLists.txt
View File

@ -42,8 +42,8 @@ endif()
add_executable(xlnt.test ${TEST_HELPERS} ${TESTS} ${RUNNER}) add_executable(xlnt.test ${TEST_HELPERS} ${TESTS} ${RUNNER})
target_link_libraries(xlnt.test target_link_libraries(xlnt.test
PRIVATE xlnt) PRIVATE xlnt
target_link_libraries(xlnt.test PRIVATE ${ZLIB_LIBRARY_RELEASE}) PRIVATE ${ZLIB_LIBRARY_RELEASE})
target_include_directories(xlnt.test target_include_directories(xlnt.test
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../source PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../source