mirror of
https://git.freebsd.org/ports.git
synced 2025-06-04 20:36:30 -04:00
0d3123d54e
ChangeLog: https://github.com/puppetlabs/leatherman/blob/master/CHANGELOG.md#112 While here, add a workaround that prevented `make test` do succeed on some environments. Regenerate all patches via `make makepatch`. With hat: puppet
20 lines
1.5 KiB
CMake
20 lines
1.5 KiB
CMake
--- cmake/cflags.cmake.orig 2017-08-25 18:32:21 UTC
|
|
+++ cmake/cflags.cmake
|
|
@@ -2,7 +2,7 @@
|
|
# Each of our project dirs sets CMAKE_CXX_FLAGS based on these. We do
|
|
# not set CMAKE_CXX_FLAGS globally because gtest is not warning-clean.
|
|
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "\\w*Clang")
|
|
- set(LEATHERMAN_CXX_FLAGS "-std=c++11 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-tautological-constant-out-of-range-compare ${CMAKE_CXX_FLAGS}")
|
|
+ set(LEATHERMAN_CXX_FLAGS "-std=c++11 -Wall -Wextra -Wno-unused-parameter -Wno-tautological-constant-out-of-range-compare ${CMAKE_CXX_FLAGS}")
|
|
|
|
# Clang warns that 'register' is deprecated; 'register' is used throughout boost, so it can't be an error yet.
|
|
# The warning flag is different on different clang versions so we need to extract the clang version.
|
|
@@ -41,7 +41,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQ
|
|
set(CMAKE_CXX_FLAGS "-Wno-maybe-uninitialized ${CMAKE_CXX_FLAGS}")
|
|
|
|
# missing-field-initializers is disabled because GCC can't make up their mind how to treat C++11 initializers
|
|
- set(LEATHERMAN_CXX_FLAGS "-std=c++11 -Wall -Werror -Wno-unused-parameter -Wno-unused-local-typedefs -Wno-unknown-pragmas -Wno-missing-field-initializers ${CMAKE_CXX_FLAGS}")
|
|
+ set(LEATHERMAN_CXX_FLAGS "-std=c++11 -Wall -Wno-unused-parameter -Wno-unused-local-typedefs -Wno-unknown-pragmas -Wno-missing-field-initializers ${CMAKE_CXX_FLAGS}")
|
|
if (NOT "${CMAKE_SYSTEM_NAME}" MATCHES "SunOS")
|
|
set(LEATHERMAN_CXX_FLAGS "-Wextra ${LEATHERMAN_CXX_FLAGS}")
|
|
endif()
|