diff --git a/ports/fuzzylite/no-werror.patch b/ports/fuzzylite/no-werror.patch new file mode 100644 index 0000000000..a5b15b8ac3 --- /dev/null +++ b/ports/fuzzylite/no-werror.patch @@ -0,0 +1,13 @@ +diff --git a/fuzzylite/CMakeLists.txt b/fuzzylite/CMakeLists.txt +index 28435e2..3824c8f 100644 +--- a/fuzzylite/CMakeLists.txt ++++ b/fuzzylite/CMakeLists.txt +@@ -74,7 +74,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY bin) + if(NOT MSVC) + #TODO: Remove -Werror before release. + #Add Unix compilation flags +- set(CMAKE_CXX_FLAGS "-pedantic -Wall -Wextra -Werror ${CMAKE_CXX_FLAGS}") ++ set(CMAKE_CXX_FLAGS "-pedantic -Wall -Wextra ${CMAKE_CXX_FLAGS}") + + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") diff --git a/ports/fuzzylite/portfile.cmake b/ports/fuzzylite/portfile.cmake index 79ec38f106..0ca3373434 100644 --- a/ports/fuzzylite/portfile.cmake +++ b/ports/fuzzylite/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF v6.0 SHA512 6f5d40d0359458e109ac2aebfbf571f61867a8b49920f4a5e1b5d86bdf578dba038b942c9e05eab0d4620f73e8cded770abe7b5e597a3b4c39dbcf6a1259f4af HEAD_REF master + PATCHES + no-werror.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" FL_BUILD_STATIC) diff --git a/ports/fuzzylite/vcpkg.json b/ports/fuzzylite/vcpkg.json index 98bb4ba80c..1956b46a51 100644 --- a/ports/fuzzylite/vcpkg.json +++ b/ports/fuzzylite/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fuzzylite", "version": "6.0", - "port-version": 5, + "port-version": 6, "description": "A fuzzy logic control library in C++", "homepage": "https://github.com/fuzzylite/fuzzylite", "license": "GPL-3.0", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index c512c024c5..f2084fd799 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -274,7 +274,6 @@ freeopcua:arm64-windows=fail ftgl:x64-uwp=fail # https://github.com/GoogleCloudPlatform/functions-framework-cpp/issues/207 functions-framework-cpp:x64-uwp=fail -fuzzylite:x64-osx=fail gazebo:x64-linux=fail # gsoap does not offer stable public source downloads diff --git a/versions/baseline.json b/versions/baseline.json index 3ee922b9fe..0ac2c09e53 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2410,7 +2410,7 @@ }, "fuzzylite": { "baseline": "6.0", - "port-version": 5 + "port-version": 6 }, "fxdiv": { "baseline": "2021-02-21", diff --git a/versions/f-/fuzzylite.json b/versions/f-/fuzzylite.json index 8741a481ea..704663aabb 100644 --- a/versions/f-/fuzzylite.json +++ b/versions/f-/fuzzylite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a82dbec4f8e74e116214cfe7120ec0aa4b5d41bf", + "version": "6.0", + "port-version": 6 + }, { "git-tree": "27926f33e6bab79f1eefa5c7999645f855c5fda3", "version": "6.0",