diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-05-29 16:42:57 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-05-30 17:39:23 -0700 |
| commit | dd444b19105992f51eb4163b94f80421b5efb8ea (patch) | |
| tree | 6220057d08578e43a13c927de1c2ffb192226ec6 | |
| parent | 1d52df8140104a969699f774dbae4fe25d2f6d00 (diff) | |
| download | vcpkg-dd444b19105992f51eb4163b94f80421b5efb8ea.tar.gz vcpkg-dd444b19105992f51eb4163b94f80421b5efb8ea.zip | |
[discord-rpc] Always use vcpkg's copy of rapidjson
| -rw-r--r-- | ports/discord-rpc/CONTROL | 3 | ||||
| -rw-r--r-- | ports/discord-rpc/portfile.cmake | 21 |
2 files changed, 10 insertions, 14 deletions
diff --git a/ports/discord-rpc/CONTROL b/ports/discord-rpc/CONTROL index 82e7515ed..ea7bc5d23 100644 --- a/ports/discord-rpc/CONTROL +++ b/ports/discord-rpc/CONTROL @@ -1,3 +1,4 @@ Source: discord-rpc -Version: 3.3.0 +Version: 3.3.0-1 Description: Rich Presence allows you to leverage the totally overhauled "Now Playing" section in a Discord user's profile to help people play your game together. +Build-Depends: rapidjson diff --git a/ports/discord-rpc/portfile.cmake b/ports/discord-rpc/portfile.cmake index 5a2f04c85..1fc21e8e6 100644 --- a/ports/discord-rpc/portfile.cmake +++ b/ports/discord-rpc/portfile.cmake @@ -8,26 +8,21 @@ vcpkg_from_github( HEAD_REF master ) -set(STATIC_CRT OFF) -if(VCPKG_CRT_LINKAGE STREQUAL static) - set(STATIC_CRT ON) -endif() +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) +file(REMOVE_RECURSE ${SOURCE_PATH}/thirdparty) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS -DUSE_STATIC_CRT=${STATIC_CRT} + PREFER_NINJA + OPTIONS + -DUSE_STATIC_CRT=${STATIC_CRT} + -DBUILD_EXAMPLES=OFF + -DRAPIDJSONTEST=TRUE + -DRAPIDJSON=${CURRENT_INSTALLED_DIR} ) vcpkg_install_cmake() -# Remove bin and debug include -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin - ${CURRENT_PACKAGES_DIR}/debug/bin) -else() - file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/send-presence.exe - ${CURRENT_PACKAGES_DIR}/debug/bin/send-presence.exe) -endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Copy copright information |