aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-11-25 13:18:22 -0800
committerGitHub <noreply@github.com>2017-11-25 13:18:22 -0800
commit90e520af8dbc4c68f9973240863f3fe5f722d3b4 (patch)
tree65a3fc5a3c6649a86957fe95fbd606195320b82a
parentb1f4391902fefab76a8c72451ca6d0609a0497e4 (diff)
parent6a2904aebdb184ffb0eca0aafda0756ad6f1ff3b (diff)
downloadvcpkg-90e520af8dbc4c68f9973240863f3fe5f722d3b4.tar.gz
vcpkg-90e520af8dbc4c68f9973240863f3fe5f722d3b4.zip
Merge pull request #2244 from janisozaur/patch-1
[jansson] Don't use WinCryptoApi for UWP builds
-rw-r--r--ports/jansson/portfile.cmake9
1 files changed, 9 insertions, 0 deletions
diff --git a/ports/jansson/portfile.cmake b/ports/jansson/portfile.cmake
index 50d5a994e..e018170c7 100644
--- a/ports/jansson/portfile.cmake
+++ b/ports/jansson/portfile.cmake
@@ -21,6 +21,14 @@ else()
set(JANSSON_BUILD_SHARED_LIBS OFF)
endif()
+# Jansson tries to random-seed its hash table with system-provided entropy.
+# This is not ported to UWP yet.
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+ set(USE_WINDOWS_CRYPTOAPI OFF)
+else()
+ set(USE_WINDOWS_CRYPTOAPI ON)
+endif()
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
@@ -28,6 +36,7 @@ vcpkg_configure_cmake(
-DJANSSON_EXAMPLES=OFF
-DJANSSON_WITHOUT_TESTS=ON
-DJANSSON_BUILD_SHARED_LIBS=${JANSSON_BUILD_SHARED_LIBS}
+ -DUSE_WINDOWS_CRYPTOAPI=${USE_WINDOWS_CRYPTOAPI}
)
vcpkg_install_cmake(DISABLE_PARALLEL)