diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-12-06 18:08:03 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-12-06 18:08:03 -0800 |
| commit | 1e6dd7b5d1820065e496a5d5c49e863cd0642ea9 (patch) | |
| tree | 01c593c8773d07841f2e58b2c4c90323101a3816 | |
| parent | d540915a3aaab722e9b627ae001168be52333662 (diff) | |
| download | vcpkg-1e6dd7b5d1820065e496a5d5c49e863cd0642ea9.tar.gz vcpkg-1e6dd7b5d1820065e496a5d5c49e863cd0642ea9.zip | |
[libsodium] Disable tests
Also, this is a workaround for x64-windows-static taking forever in VS2017 15.5
| -rw-r--r-- | ports/libsodium/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libsodium/disable-tests.patch | 16 | ||||
| -rw-r--r-- | ports/libsodium/portfile.cmake | 6 |
3 files changed, 23 insertions, 1 deletions
diff --git a/ports/libsodium/CONTROL b/ports/libsodium/CONTROL index 185718572..4048a6a1f 100644 --- a/ports/libsodium/CONTROL +++ b/ports/libsodium/CONTROL @@ -1,3 +1,3 @@ Source: libsodium -Version: 1.0.15 +Version: 1.0.15-1 Description: A modern and easy-to-use crypto library diff --git a/ports/libsodium/disable-tests.patch b/ports/libsodium/disable-tests.patch new file mode 100644 index 000000000..24bcc1d83 --- /dev/null +++ b/ports/libsodium/disable-tests.patch @@ -0,0 +1,16 @@ +diff --git a/msvc-scripts/sodium.props b/msvc-scripts/sodium.props +index 41e1e47..3126455 100644 +--- a/msvc-scripts/sodium.props ++++ b/msvc-scripts/sodium.props +@@ -17,9 +17,9 @@ + <PreBuildEvent> + <Message>Process .in files</Message> + </PreBuildEvent> +- <PostBuildEvent> ++ <!-- <PostBuildEvent> + <Command>"$(SolutionDir)/test/default/wintest.bat" $(Configuration) $(Platform)</Command> +- </PostBuildEvent> ++ </PostBuildEvent> --> + <PostBuildEvent> + <Message>Run the test suite</Message> + </PostBuildEvent> diff --git a/ports/libsodium/portfile.cmake b/ports/libsodium/portfile.cmake index c781fb1fb..4a2ed3d77 100644 --- a/ports/libsodium/portfile.cmake +++ b/ports/libsodium/portfile.cmake @@ -10,6 +10,12 @@ vcpkg_from_github( HEAD_REF master ) +vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/disable-tests.patch +) + if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(LIBSODIUM_RELEASE_CONFIGURATION ReleaseDLL) set(LIBSODIUM_DEBUG_CONFIGURATION DebugDLL) |