[rttr] Update to latest commit for supporting c++20 (#29806)

* [rttr] Update to latest commit for support c++20

* Modify name of patch
This commit is contained in:
Cheney Wang 2023-02-23 11:09:43 -08:00 committed by GitHub
parent 82e03905f5
commit 98facc403c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 32 additions and 27 deletions

View File

@ -1,12 +0,0 @@
diff --git a/src/rttr/variant.h b/src/rttr/variant.h
index cec094b0..40978e3b 100644
--- a/src/rttr/variant.h
+++ b/src/rttr/variant.h
@@ -38,6 +38,7 @@
#include <cstddef>
#include <cstdint>
#include <algorithm>
+#include <string>
namespace rttr
{

View File

@ -0,0 +1,13 @@
diff --git a/src/rttr/detail/misc/flat_map.h b/src/rttr/detail/misc/flat_map.h
index 767c97b..ba97cc7 100644
--- a/src/rttr/detail/misc/flat_map.h
+++ b/src/rttr/detail/misc/flat_map.h
@@ -36,7 +36,7 @@
#include <utility>
#include <functional>
#include <algorithm>
-#include <ciso646> // _LIBCPP_VERSION
+//#include <ciso646> // _LIBCPP_VERSION
namespace rttr
{

View File

@ -1,14 +1,14 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO rttrorg/rttr
REF v0.9.6
SHA512 5c94f037b319568d351ee6d25f1404adce00b40598dce4a331789d5357c059e50aae3894f90e60d37307b7e96f4672ae09d3798bbe47f796ef2044f1ac6f9e50
REF 7edbd580cfad509a3253c733e70144e36f02ecd4
SHA512 17432728037bc0f8e346c6bd01298c6ee3a4714c83505b2cf1bc23305acea5cc55925e7fc28a8cf182b6ba26abdc9d40ea2f5b168615c030d5ebeec9a8961636
HEAD_REF master
PATCHES
fix-directory-output.patch
Fix-depends.patch
remove-owner-read-perms.patch
253.patch # https://github.com/rttrorg/rttr/pull/253/
disable-unsupport-header.patch
)
if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static" AND "${VCPKG_CRT_LINKAGE}" STREQUAL "static")
@ -47,7 +47,7 @@ else()
vcpkg_cmake_config_fixup(CONFIG_PATH share/rttr/cmake)
endif()
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/share"

View File

@ -1,5 +1,5 @@
diff --git a/CMake/config.cmake b/CMake/config.cmake
index 4483900..dfef016 100644
index 6b9eba8..e465709 100644
--- a/CMake/config.cmake
+++ b/CMake/config.cmake
@@ -171,6 +171,5 @@ if (BUILD_INSTALLER)
@ -7,24 +7,24 @@ index 4483900..dfef016 100644
install(FILES "${LICENSE_FILE}" "${README_FILE}"
- DESTINATION ${RTTR_ADDITIONAL_FILES_INSTALL_DIR}
- PERMISSIONS OWNER_READ)
- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ DESTINATION ${RTTR_ADDITIONAL_FILES_INSTALL_DIR})
endif()
diff --git a/CMake/utility.cmake b/CMake/utility.cmake
index 7e1f677..a3932ae 100644
index cd1e835..8e7a0c6 100644
--- a/CMake/utility.cmake
+++ b/CMake/utility.cmake
@@ -165,7 +165,7 @@ function(loadFolder FOLDER _HEADER_FILES _SOURCE_FILES)
getNameOfDir(CMAKE_CURRENT_SOURCE_DIR DIRNAME)
if (${shouldInstall})
if (NOT ${FULL_HEADER_PATH} MATCHES ".*_p.h$") # we don't want to install header files which are marked as private
- install(FILES ${FULL_HEADER_PATH} DESTINATION "include/${DIRNAME}/${REL_PATH}" PERMISSIONS OWNER_READ)
- install(FILES ${FULL_HEADER_PATH} DESTINATION "include/${DIRNAME}/${REL_PATH}" PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ install(FILES ${FULL_HEADER_PATH} DESTINATION "include/${DIRNAME}/${REL_PATH}")
endif()
endif()
endforeach()
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index bacb280..a92d642 100644
index de70600..a92d642 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -132,12 +132,10 @@ set_target_properties(doc PROPERTIES FOLDER "Documentation")
@ -32,12 +32,12 @@ index bacb280..a92d642 100644
install(DIRECTORY "${DOXYGEN_OUTPUT_DIRECTORY}/${DOXYGEN_CUSTOM_HTML_DIR}"
DESTINATION "${DOXYGEN_DOC_INSTALL_DIR}"
- PATTERN "*.*"
- PERMISSIONS OWNER_READ)
- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ PATTERN "*.*")
install(FILES "${DOXYGEN_OUTPUT_DIRECTORY}/${DOXYGEN_INDEX_FILE}"
- DESTINATION "${DOXYGEN_DOC_INSTALL_DIR}"
- PERMISSIONS OWNER_READ)
- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ DESTINATION "${DOXYGEN_DOC_INSTALL_DIR}")
#########################################################################################

View File

@ -1,7 +1,6 @@
{
"name": "rttr",
"version": "0.9.6",
"port-version": 5,
"version": "0.9.6+20210811",
"description": "an easy and intuitive way to use reflection in C++",
"homepage": "https://github.com/rttrorg/rttr",
"license": "MIT",

View File

@ -6945,8 +6945,8 @@
"port-version": 2
},
"rttr": {
"baseline": "0.9.6",
"port-version": 5
"baseline": "0.9.6+20210811",
"port-version": 0
},
"rubberband": {
"baseline": "3.1.1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "efee986c87a05c8b3257d2aa4d793441af9e970f",
"version": "0.9.6+20210811",
"port-version": 0
},
{
"git-tree": "2a535fc9ac44aea50a9e4f41a4698b86b1a2e747",
"version": "0.9.6",