try to find vcpkg cryptopp with FindCryptoPP.cmake

This commit is contained in:
Thomas Fussell 2017-03-11 14:29:55 -05:00
parent eb078dce99
commit f7e8e40ce2
2 changed files with 2 additions and 2 deletions

View File

@ -22,7 +22,7 @@ install:
- 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 -DCRYPTOPP_LIBRARY=vcpkg/installed/x86-windows/lib/cryptopp-static.lib - cmake -H. -Bbuild -G"Visual Studio 14 2015" -DSTATIC=%STATIC% -DSAMPLES=ON -DBENCHMARKS=ON -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake
build: build:
project: build/tests/xlnt.test.sln project: build/tests/xlnt.test.sln

View File

@ -60,7 +60,7 @@ FIND_LIBRARY (CRYPTOPP_LIBRARY_DEBUG
DOC "CryptoPP debug library") DOC "CryptoPP debug library")
FIND_LIBRARY (CRYPTOPP_LIBRARY_RELEASE FIND_LIBRARY (CRYPTOPP_LIBRARY_RELEASE
NAMES cryptlib cryptopp NAMES cryptlib cryptopp cryptopp-static
HINTS ${CRYPTOPP_ROOT_DIR} HINTS ${CRYPTOPP_ROOT_DIR}
PATH_SUFFIXES lib PATH_SUFFIXES lib
DOC "CryptoPP release library") DOC "CryptoPP release library")