diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-06-12 11:37:19 -0700 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-06-12 11:37:19 -0700 |
| commit | 92444393148ab0bc89de6ce1cae945cee428a091 (patch) | |
| tree | a443d63129d93dd729438929bce402b80f1c50c1 /ports/cryptopp | |
| parent | 874eadc574b94a05607a8408958401a524c10447 (diff) | |
| parent | 59a8a9c6248ed230b19028a44484ae5f06db697d (diff) | |
| download | vcpkg-92444393148ab0bc89de6ce1cae945cee428a091.tar.gz vcpkg-92444393148ab0bc89de6ce1cae945cee428a091.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg into add_libraqm
Diffstat (limited to 'ports/cryptopp')
| -rw-r--r-- | ports/cryptopp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/cryptopp/portfile.cmake | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/ports/cryptopp/CONTROL b/ports/cryptopp/CONTROL index e3a5d79de..c65a43c90 100644 --- a/ports/cryptopp/CONTROL +++ b/ports/cryptopp/CONTROL @@ -1,3 +1,3 @@ Source: cryptopp -Version: 8.1.0 +Version: 8.1.0-1 Description: Crypto++ is a free C++ class library of cryptographic schemes. diff --git a/ports/cryptopp/portfile.cmake b/ports/cryptopp/portfile.cmake index b4f35e7e6..ad6557f77 100644 --- a/ports/cryptopp/portfile.cmake +++ b/ports/cryptopp/portfile.cmake @@ -26,6 +26,14 @@ vcpkg_from_github( file(COPY ${CMAKE_SOURCE_PATH}/cryptopp-config.cmake DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_SOURCE_PATH}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +# disable assembly on OSX to fix broken build +if(APPLE) + set(CRYPTOPP_DISABLE_ASM "ON") +else() + set(CRYPTOPP_DISABLE_ASM "OFF") +endif() + + # Dynamic linking should be avoided for Crypto++ to reduce the attack surface, # so generate a static lib for both dynamic and static vcpkg targets. # See also: @@ -40,6 +48,7 @@ vcpkg_configure_cmake( -DBUILD_STATIC=ON -DBUILD_TESTING=OFF -DBUILD_DOCUMENTATION=OFF + -DDISABLE_ASM=${CRYPTOPP_DISABLE_ASM} ) vcpkg_install_cmake() |