diff --git a/ports/rttr/disable-werrorr.patch b/ports/rttr/disable-werrorr.patch new file mode 100644 index 00000000000000..8e9d944114fa43 --- /dev/null +++ b/ports/rttr/disable-werrorr.patch @@ -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" diff --git a/ports/rttr/portfile.cmake b/ports/rttr/portfile.cmake index 92d426ac7646b5..cbb9a155564817 100644 --- a/ports/rttr/portfile.cmake +++ b/ports/rttr/portfile.cmake @@ -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") diff --git a/ports/rttr/vcpkg.json b/ports/rttr/vcpkg.json index d662479d8db8e3..26be709d0a1c36 100644 --- a/ports/rttr/vcpkg.json +++ b/ports/rttr/vcpkg.json @@ -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", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index e5b84d3bba7f6e..3a742d0d6a9099 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -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 diff --git a/versions/baseline.json b/versions/baseline.json index d37c34cf07cd28..5383c64971a0be 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7738,7 +7738,7 @@ }, "rttr": { "baseline": "0.9.6+20210811", - "port-version": 0 + "port-version": 1 }, "rubberband": { "baseline": "3.3.0", diff --git a/versions/r-/rttr.json b/versions/r-/rttr.json index 7149a6df7a557d..6c0bdeb3fd5a2e 100644 --- a/versions/r-/rttr.json +++ b/versions/r-/rttr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "942efa7d91154b3d9841608a015b1c216ca0f251", + "version": "0.9.6+20210811", + "port-version": 1 + }, { "git-tree": "efee986c87a05c8b3257d2aa4d793441af9e970f", "version": "0.9.6+20210811",