diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-08-13 16:07:26 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-08-15 11:17:40 -0700 |
| commit | ba5d624e8bfbf5bb763a1daf67ddfa2b6518313a (patch) | |
| tree | 82d467b85005e68580fa471854f3ae26f880cb07 /ports | |
| parent | f46cd9ae88d00ec6907c6ad5982c294da2fab1ae (diff) | |
| download | vcpkg-ba5d624e8bfbf5bb763a1daf67ddfa2b6518313a.tar.gz vcpkg-ba5d624e8bfbf5bb763a1daf67ddfa2b6518313a.zip | |
[folly] Do not use -Werror
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/folly/no-werror.patch | 12 | ||||
| -rw-r--r-- | ports/folly/portfile.cmake | 5 |
2 files changed, 15 insertions, 2 deletions
diff --git a/ports/folly/no-werror.patch b/ports/folly/no-werror.patch new file mode 100644 index 000000000..e9ec920dc --- /dev/null +++ b/ports/folly/no-werror.patch @@ -0,0 +1,12 @@ +diff --git a/CMake/FollyCompilerUnix.cmake b/CMake/FollyCompilerUnix.cmake
+index b7d994b..a518cbe 100644
+--- a/CMake/FollyCompilerUnix.cmake
++++ b/CMake/FollyCompilerUnix.cmake
+@@ -16,7 +16,6 @@ function(apply_folly_compile_options_to_target THETARGET)
+ -std=gnu++14
+ -finput-charset=UTF-8
+ -fsigned-char
+- -Werror
+ -Wall
+ -Wno-deprecated
+ -Wdeprecated-declarations
diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index 8ad63bd8c..2112c9280 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -12,7 +12,7 @@ include(vcpkg_common_functions) # Required to run build/generate_escape_tables.py et al. vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) -set(ENV{PATH} "$ENV{PATH};${PYTHON3_DIR}") +vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -21,7 +21,8 @@ vcpkg_from_github( SHA512 38e7b713572d4af0a6453d001eddc32c74b4ec100158300c0a3a61a88ec546b449f1973c2b624273da4278173782aa71695d981dba3c8f423f5b76ed1375d286 HEAD_REF master PATCHES - ${CMAKE_CURRENT_LIST_DIR}/find-gflags.patch + find-gflags.patch + no-werror.patch ) file(COPY |