From 3b35dbb9011a8093ec5574b8d7c1aba72a4a2dfd Mon Sep 17 00:00:00 2001 From: Thomas Fussell Date: Sat, 11 Mar 2017 11:15:35 -0500 Subject: [PATCH] specify cryptopp library name for appveyor --- .appveyor.yml | 3 +-- tests/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 2fe5583b..4ae3daf9 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -19,11 +19,10 @@ install: - powershell -exec bypass scripts\bootstrap.ps1 - vcpkg install cryptopp zlib expat - vcpkg integrate install -- dir installed\x86-windows\lib - cd .. 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: project: build/tests/xlnt.test.sln diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index d2a5f1a1..9c395b24 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -42,8 +42,8 @@ endif() add_executable(xlnt.test ${TEST_HELPERS} ${TESTS} ${RUNNER}) target_link_libraries(xlnt.test - PRIVATE xlnt) -target_link_libraries(xlnt.test PRIVATE ${ZLIB_LIBRARY_RELEASE}) + PRIVATE xlnt + PRIVATE ${ZLIB_LIBRARY_RELEASE}) target_include_directories(xlnt.test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../source