diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-11-14 15:11:41 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-12-04 18:01:23 -0800 |
| commit | 4d1fd42fca46f4c4dfe35011c8c96ff941db3ca6 (patch) | |
| tree | 6421689984d4d86b4981b8e4d5c6d9c77cd7d968 /ports/discord-rpc | |
| parent | 8f6e2303f5d0fc80236888d7628ba291b5157141 (diff) | |
| download | vcpkg-4d1fd42fca46f4c4dfe35011c8c96ff941db3ca6.tar.gz vcpkg-4d1fd42fca46f4c4dfe35011c8c96ff941db3ca6.zip | |
[vcpkg-toolchains] Use XYZ_INIT CMake variables for _significantly_ better integration
[brynet] Add missing openssl dependency
[discord-rpc] Ensure no external downloading
[podofo] Improve stability. Modernize.
[usrsctp] Disable Werror
[vcpkg-toolchains] Add linux changes to android and freebsd.
[usrsctp] Remove excess DLLs
Diffstat (limited to 'ports/discord-rpc')
| -rw-r--r-- | ports/discord-rpc/CONTROL | 2 | ||||
| -rw-r--r-- | ports/discord-rpc/disable-downloading.patch | 21 | ||||
| -rw-r--r-- | ports/discord-rpc/portfile.cmake | 5 |
3 files changed, 27 insertions, 1 deletions
diff --git a/ports/discord-rpc/CONTROL b/ports/discord-rpc/CONTROL index ea7bc5d23..b6af1dc98 100644 --- a/ports/discord-rpc/CONTROL +++ b/ports/discord-rpc/CONTROL @@ -1,4 +1,4 @@ Source: discord-rpc -Version: 3.3.0-1 +Version: 3.3.0-2 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/disable-downloading.patch b/ports/discord-rpc/disable-downloading.patch new file mode 100644 index 000000000..bb8504960 --- /dev/null +++ b/ports/discord-rpc/disable-downloading.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5dad9e9..961f02d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -12,6 +12,7 @@ file(GLOB_RECURSE ALL_SOURCE_FILES
+ src/*.cpp src/*.h src/*.c
+ )
+
++if(0)
+ # Set CLANG_FORMAT_SUFFIX if you are using custom clang-format, e.g. clang-format-5.0
+ find_program(CLANG_FORMAT_CMD clang-format${CLANG_FORMAT_SUFFIX})
+
+@@ -43,7 +44,7 @@ if (NOT RAPIDJSONTEST)
+ )
+ file(REMOVE ${RJ_TAR_FILE})
+ endif(NOT RAPIDJSONTEST)
+-
++endif()
+ find_file(RAPIDJSON NAMES rapidjson rapidjson-1.1.0 PATHS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty CMAKE_FIND_ROOT_PATH_BOTH)
+
+ add_library(rapidjson STATIC IMPORTED ${RAPIDJSON})
diff --git a/ports/discord-rpc/portfile.cmake b/ports/discord-rpc/portfile.cmake index 1fc21e8e6..1dd6d3001 100644 --- a/ports/discord-rpc/portfile.cmake +++ b/ports/discord-rpc/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( REF v3.3.0 SHA512 8bb2674edefabf75670ceca29364d69e2002152bff9fe55757f4cda03544b4d827ff33595d98e6d8acdc73ca61cef8ab8054ad0a1ffc905cb26496068b15025f HEAD_REF master + PATCHES disable-downloading.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) @@ -21,6 +22,10 @@ vcpkg_configure_cmake( -DRAPIDJSON=${CURRENT_INSTALLED_DIR} ) +if(EXISTS ${SOURCE_PATH}/thirdparty) + message(FATAL_ERROR "The source directory should not be modified during the build.") +endif() + vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) |