mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-15 03:27:58 +08:00
[rttr] Add dependency rapidjson (#9252)
* [rttr] Add dependency rapidjson * [rttr] Modify ci.baseline.txt * [rttr] Handle copyright
This commit is contained in:
parent
66f0eb04a5
commit
0d5fc4c6ef
@ -1,4 +1,5 @@
|
||||
Source: rttr
|
||||
Version: 0.9.6-1
|
||||
Version: 0.9.6-2
|
||||
Homepage: https://github.com/rttrorg/rttr
|
||||
Description: an easy and intuitive way to use reflection in C++
|
||||
Build-Depends: rapidjson
|
||||
|
14
ports/rttr/Fix-depends.patch
Normal file
14
ports/rttr/Fix-depends.patch
Normal file
@ -0,0 +1,14 @@
|
||||
diff --git a/CMake/3rd_party_libs.cmake b/CMake/3rd_party_libs.cmake
|
||||
index dca5071..4dd4471 100644
|
||||
--- a/CMake/3rd_party_libs.cmake
|
||||
+++ b/CMake/3rd_party_libs.cmake
|
||||
@@ -51,7 +51,8 @@ if (BUILD_BENCHMARKS)
|
||||
find_package(Threads REQUIRED)
|
||||
endif()
|
||||
|
||||
-set(RAPID_JSON_DIR ${RTTR_3RD_PARTY_DIR}/rapidjson-1.1.0)
|
||||
+find_package(RapidJSON CONFIG REQUIRED)
|
||||
+set(RAPID_JSON_DIR ${RAPIDJSON_INCLUDE_DIRS})
|
||||
set(NONIUS_DIR ${RTTR_3RD_PARTY_DIR}/nonius-1.1.2)
|
||||
|
||||
# Prepare "Catch" library for other executables
|
@ -1,5 +1,3 @@
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO rttrorg/rttr
|
||||
@ -8,7 +6,8 @@ vcpkg_from_github(
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-directory-output.patch
|
||||
remove-owner-read-perms.patch
|
||||
Fix-depends.patch
|
||||
remove-owner-read-perms.patch
|
||||
)
|
||||
|
||||
#Handle static lib
|
||||
@ -43,8 +42,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
||||
endif()
|
||||
|
||||
#Handle copyright
|
||||
file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/rttr)
|
||||
file(RENAME ${CURRENT_PACKAGES_DIR}/share/rttr/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/rttr/copyright)
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
file(REMOVE_RECURSE
|
||||
${CURRENT_PACKAGES_DIR}/debug/include
|
||||
${CURRENT_PACKAGES_DIR}/debug/share
|
||||
|
@ -1471,7 +1471,6 @@ rpclib:x64-uwp=fail
|
||||
rpclib:x64-windows=ignore
|
||||
rpclib:x86-windows=ignore
|
||||
rpclib:x64-windows-static=ignore
|
||||
rttr:arm64-windows=fail
|
||||
rttr:arm-uwp=fail
|
||||
rttr:x64-uwp=fail
|
||||
scintilla:arm64-windows=fail
|
||||
|
Loading…
x
Reference in New Issue
Block a user