diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-12-05 11:48:51 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-05 11:48:51 -0800 |
| commit | 35be0e7c2b3f408d043073140bbccf3a5dd71944 (patch) | |
| tree | dde00410536684712600c470968d6cff7607f445 | |
| parent | b656594f3920be2fcc92629cdf084543b223bbfb (diff) | |
| parent | 89771b0d398e84a392947bc6f856bd0abf711213 (diff) | |
| download | vcpkg-35be0e7c2b3f408d043073140bbccf3a5dd71944.tar.gz vcpkg-35be0e7c2b3f408d043073140bbccf3a5dd71944.zip | |
Merge pull request #4853 from youknowone/flatbuffer-gcc8
[flatbuffers] disable -Werror for gcc8
| -rw-r--r-- | ports/flatbuffers/CONTROL | 2 | ||||
| -rw-r--r-- | ports/flatbuffers/no-werror.patch | 23 | ||||
| -rw-r--r-- | ports/flatbuffers/portfile.cmake | 4 |
3 files changed, 27 insertions, 2 deletions
diff --git a/ports/flatbuffers/CONTROL b/ports/flatbuffers/CONTROL index 0b90b40c2..9dc3a871f 100644 --- a/ports/flatbuffers/CONTROL +++ b/ports/flatbuffers/CONTROL @@ -1,4 +1,4 @@ Source: flatbuffers -Version: 1.9.0-2 +Version: 1.9.0-3 Description: Memory Efficient Serialization Library http://google.github.io/flatbuffers/ FlatBuffers is an efficient cross platform serialization library for games and other memory constrained apps. It allows you to directly access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility. diff --git a/ports/flatbuffers/no-werror.patch b/ports/flatbuffers/no-werror.patch new file mode 100644 index 000000000..7c2d548b9 --- /dev/null +++ b/ports/flatbuffers/no-werror.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a3388dd..f0626e5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -119,12 +119,16 @@ elseif(CMAKE_COMPILER_IS_GNUCXX) + "${CMAKE_CXX_FLAGS} -std=c++0x") + endif(CYGWIN) + set(CMAKE_CXX_FLAGS +- "${CMAKE_CXX_FLAGS} -Wall -pedantic -Werror -Wextra -Werror=shadow") ++ "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -Werror=shadow") + if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.4) + if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) + set(CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} -faligned-new") + endif() ++ if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0) ++ set(CMAKE_CXX_FLAGS ++ "${CMAKE_CXX_FLAGS} -Wextra") ++ endif() + set(CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} -Wunused-result -Werror=unused-result -Wunused-parameter -Werror=unused-parameter") + endif() + diff --git a/ports/flatbuffers/portfile.cmake b/ports/flatbuffers/portfile.cmake index b6a0e6ba5..d98d5ce48 100644 --- a/ports/flatbuffers/portfile.cmake +++ b/ports/flatbuffers/portfile.cmake @@ -10,7 +10,9 @@ vcpkg_from_github( REF v1.9.0 SHA512 0ba07dbe5b2fde1d0a6e14ee26ee2816062541d934eda204b846a30c019362f2626761b628c900293928b9b546dba8ca477c13182e022c3e0e0a142fd67f0696 HEAD_REF master - PATCHES ${CMAKE_CURRENT_LIST_DIR}/ignore_use_of_cmake_toolchain_file.patch + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/ignore_use_of_cmake_toolchain_file.patch + ${CMAKE_CURRENT_LIST_DIR}/no-werror.patch ) set(OPTIONS) |