Skip to content

Commit c7925c6

Browse files
nickclark2016nickclark2016
authored
Merge pull request #2417 from artamonovoleg/master
fix warnings function for the xcode4 generator
2 parents da8cacd + 216807e commit c7925c6

File tree

2 files changed

+108
-0
lines changed

2 files changed

+108
-0
lines changed

‎modules/xcode/tests/test_xcode_project.lua

+53
Original file line numberDiff line numberDiff line change
@@ -2681,11 +2681,64 @@
26812681
isa = XCBuildConfiguration;
26822682
buildSettings = {
26832683
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
2684+
CLANG_WARN_ASSIGN_ENUM = YES;
2685+
CLANG_WARN_ATOMIC_IMPLICIT_SEQ_CST = YES;
2686+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
2687+
CLANG_WARN_BOOL_CONVERSION = YES;
2688+
CLANG_WARN_COMMA = YES;
2689+
CLANG_WARN_COMPLETION_HANDLER_MISUSE = YES;
2690+
CLANG_WARN_CONSTANT_CONVERSION = YES;
2691+
CLANG_WARN_CXX0X_EXTENSIONS = YES;
2692+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
2693+
CLANG_WARN_EMPTY_BODY = YES;
2694+
CLANG_WARN_ENUM_CONVERSION = YES;
2695+
CLANG_WARN_FLOAT_CONVERSION = YES;
2696+
CLANG_WARN_FRAMEWORK_INCLUDE_PRIVATE_FROM_PUBLIC = YES;
2697+
CLANG_WARN_IMPLICIT_FALLTHROUGH = YES;
2698+
CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
2699+
CLANG_WARN_INFINITE_RECURSION = YES;
2700+
CLANG_WARN_INT_CONVERSION = YES;
2701+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
2702+
CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
2703+
CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
2704+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
2705+
CLANG_WARN_OBJC_INTERFACE_IVARS = YES;
2706+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
2707+
CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = YES;
2708+
CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
2709+
CLANG_WARN_PRAGMA_PACK = YES;
2710+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
2711+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
2712+
CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
2713+
CLANG_WARN_STRICT_PROTOTYPES = YES;
2714+
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
2715+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
2716+
CLANG_WARN_UNREACHABLE_CODE = YES;
2717+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
2718+
CLANG_WARN__EXIT_TIME_DESTRUCTORS = YES;
26842719
CONFIGURATION_BUILD_DIR = "$(SYMROOT)";
26852720
CONFIGURATION_TEMP_DIR = "$(OBJROOT)";
26862721
GCC_OPTIMIZATION_LEVEL = 0;
26872722
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
2723+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
2724+
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
2725+
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
2726+
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
26882727
GCC_WARN_ABOUT_RETURN_TYPE = YES;
2728+
GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
2729+
GCC_WARN_INHIBIT_ALL_WARNINGS = NO;
2730+
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
2731+
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
2732+
GCC_WARN_PEDANTIC = YES;
2733+
GCC_WARN_SHADOW = YES;
2734+
GCC_WARN_SIGN_COMPARE = YES;
2735+
GCC_WARN_STRICT_SELECTOR_MATCH = YES;
2736+
GCC_WARN_UNDECLARED_SELECTOR = YES;
2737+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
2738+
GCC_WARN_UNKNOWN_PRAGMAS = YES;
2739+
GCC_WARN_UNUSED_FUNCTION = YES;
2740+
GCC_WARN_UNUSED_LABEL = YES;
2741+
GCC_WARN_UNUSED_PARAMETER = YES;
26892742
GCC_WARN_UNUSED_VARIABLE = YES;
26902743
OBJROOT = obj/Debug;
26912744
ONLY_ACTIVE_ARCH = NO;

‎modules/xcode/xcode_common.lua

+55
Original file line numberDiff line numberDiff line change
@@ -1614,6 +1614,61 @@
16141614
settings['WARNING_CFLAGS'] = '-Wall -Wextra'
16151615
elseif cfg.warnings == "Everything" then
16161616
settings['WARNING_CFLAGS'] = '-Weverything'
1617+
settings["CLANG_WARN_ASSIGN_ENUM"] = "YES"
1618+
settings["CLANG_WARN_ATOMIC_IMPLICIT_SEQ_CST"] = "YES"
1619+
settings["CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING"] = "YES"
1620+
settings["CLANG_WARN_BOOL_CONVERSION"] = "YES"
1621+
settings["CLANG_WARN_COMMA"] = "YES"
1622+
settings["CLANG_WARN_COMPLETION_HANDLER_MISUSE"] = "YES"
1623+
settings["CLANG_WARN_CONSTANT_CONVERSION"] = "YES"
1624+
settings["CLANG_WARN_CXX0X_EXTENSIONS"] = "YES"
1625+
settings["CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS"] = "YES"
1626+
settings["CLANG_WARN_EMPTY_BODY"] = "YES"
1627+
settings["CLANG_WARN_ENUM_CONVERSION"] = "YES"
1628+
settings["CLANG_WARN_FLOAT_CONVERSION"] = "YES"
1629+
settings["CLANG_WARN_FRAMEWORK_INCLUDE_PRIVATE_FROM_PUBLIC"] = "YES"
1630+
settings["CLANG_WARN_IMPLICIT_FALLTHROUGH"] = "YES"
1631+
settings["CLANG_WARN_IMPLICIT_SIGN_CONVERSION"] = "YES"
1632+
settings["CLANG_WARN_INFINITE_RECURSION"] = "YES"
1633+
settings["CLANG_WARN_INT_CONVERSION"] = "YES"
1634+
settings["CLANG_WARN_NON_LITERAL_NULL_CONVERSION"] = "YES"
1635+
settings["CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE"] = "YES"
1636+
settings["CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES"] = "YES"
1637+
settings["CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF"] = "YES"
1638+
settings["CLANG_WARN_OBJC_INTERFACE_IVARS"] = "YES"
1639+
settings["CLANG_WARN_OBJC_LITERAL_CONVERSION"] = "YES"
1640+
settings["CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS"] = "YES"
1641+
settings["CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK"] = "YES"
1642+
settings["CLANG_WARN_PRAGMA_PACK"] = "YES"
1643+
settings["CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER"] = "YES"
1644+
settings["CLANG_WARN_RANGE_LOOP_ANALYSIS"] = "YES"
1645+
settings["CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY"] = "YES"
1646+
settings["CLANG_WARN_STRICT_PROTOTYPES"] = "YES"
1647+
settings["CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION"] = "YES"
1648+
settings["CLANG_WARN_SUSPICIOUS_MOVE"] = "YES"
1649+
settings["CLANG_WARN_UNREACHABLE_CODE"] = "YES"
1650+
settings["CLANG_WARN__DUPLICATE_METHOD_MATCH"] = "YES"
1651+
settings["CLANG_WARN__EXIT_TIME_DESTRUCTORS"] = "YES"
1652+
settings["GCC_WARN_64_TO_32_BIT_CONVERSION"] = "YES"
1653+
settings["GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS"] = "YES"
1654+
settings["GCC_WARN_ABOUT_MISSING_NEWLINE"] = "YES"
1655+
settings["GCC_WARN_ABOUT_MISSING_PROTOTYPES"] = "YES"
1656+
settings["GCC_WARN_ABOUT_RETURN_TYPE"] = "YES"
1657+
settings["GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS"] = "YES"
1658+
settings["GCC_WARN_INHIBIT_ALL_WARNINGS"] = "NO"
1659+
settings["GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED"] = "YES"
1660+
settings["GCC_WARN_NON_VIRTUAL_DESTRUCTOR"] = "YES"
1661+
settings["GCC_WARN_PEDANTIC"] = "YES"
1662+
settings["GCC_WARN_SHADOW"] = "YES"
1663+
settings["GCC_WARN_SIGN_COMPARE"] = "YES"
1664+
settings["GCC_WARN_STRICT_SELECTOR_MATCH"] = "YES"
1665+
settings["GCC_WARN_UNDECLARED_SELECTOR"] = "YES"
1666+
settings["GCC_WARN_UNINITIALIZED_AUTOS"] = "YES"
1667+
settings["GCC_WARN_UNKNOWN_PRAGMAS"] = "YES"
1668+
settings["GCC_WARN_UNUSED_FUNCTION"] = "YES"
1669+
settings["GCC_WARN_UNUSED_LABEL"] = "YES"
1670+
settings["GCC_WARN_UNUSED_PARAMETER"] = "YES"
1671+
settings["GCC_WARN_UNUSED_VARIABLE"] = "YES"
16171672
end
16181673

16191674
xcode.XCBuildConfiguration_SwiftLanguageVersion(settings, cfg)

0 commit comments

Comments
 (0)