aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeong Yunwon <jeong@youknowone.org>2018-11-29 16:09:08 +0900
committerJeong Yunwon <jeong@youknowone.org>2018-11-29 16:09:08 +0900
commited9d726429bfa029b9cbcb565821740fe7256f32 (patch)
tree0d8cb67c9bf6a0caf81b2727f50b7ed576164cc4
parent09103d12a02ac588fe875235c3661ad4bc8cd46a (diff)
downloadvcpkg-ed9d726429bfa029b9cbcb565821740fe7256f32.tar.gz
vcpkg-ed9d726429bfa029b9cbcb565821740fe7256f32.zip
[flatbuffers] disable -Werror for gcc8
-rw-r--r--ports/flatbuffers/no-werror.patch23
-rw-r--r--ports/flatbuffers/portfile.cmake4
2 files changed, 26 insertions, 1 deletions
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)