Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[rttr] Disable -Werror in order to support android #37406

Merged
merged 6 commits into from
Mar 18, 2024
Merged

[rttr] Disable -Werror in order to support android #37406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
83fe3e3
[rttr] support android
FrankXie05 Mar 13, 2024
23eb9c1
version
FrankXie05 Mar 13, 2024
456be5e
disable -Werror
FrankXie05 Mar 18, 2024
29e3ae2
version
FrankXie05 Mar 18, 2024
aea90ed
patch name
FrankXie05 Mar 18, 2024
7b5802b
version
FrankXie05 Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ports/rttr/disable-werrorr.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMake/utility.cmake b/CMake/utility.cmake
index 8e7a0c6..ac5e305 100644
--- a/CMake/utility.cmake
+++ b/CMake/utility.cmake
@@ -395,7 +395,7 @@ function( set_compiler_warnings target)
set(WARNINGS "-Werror"
"-Wall")
elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- set(WARNINGS "-Werror"
+ set(WARNINGS
"-Wall")
elseif(MSVC)
set(WARNINGS "/WX"
1 change: 1 addition & 0 deletions ports/rttr/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ vcpkg_from_github(
Fix-depends.patch
remove-owner-read-perms.patch
disable-unsupport-header.patch
disable-werrorr.patch
)

if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static" AND "${VCPKG_CRT_LINKAGE}" STREQUAL "static")
Expand Down
1 change: 1 addition & 0 deletions ports/rttr/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "rttr",
"version": "0.9.6+20210811",
"port-version": 1,
"description": "an easy and intuitive way to use reflection in C++",
"homepage": "https://github.com/rttrorg/rttr",
"license": "MIT",
Expand Down
3 changes: 0 additions & 3 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1005,9 +1005,6 @@ rply:arm64-windows=skip
rply:x64-linux=skip
rply:x64-osx=skip
rply:x64-windows-static-md=skip
rttr:arm-neon-android=fail
rttr:arm64-android=fail
rttr:x64-android=fail
salome-medcoupling:x64-linux=fail
scintilla:arm-neon-android=fail
scintilla:arm64-android=fail
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7738,7 +7738,7 @@
},
"rttr": {
"baseline": "0.9.6+20210811",
"port-version": 0
"port-version": 1
},
"rubberband": {
"baseline": "3.3.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/r-/rttr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "942efa7d91154b3d9841608a015b1c216ca0f251",
"version": "0.9.6+20210811",
"port-version": 1
},
{
"git-tree": "efee986c87a05c8b3257d2aa4d793441af9e970f",
"version": "0.9.6+20210811",
Expand Down