Skip to content

Commit cbaf028

Browse files
simartinsimartin
committed
Synchronize source file list and enable C++11 build in XCode project.
1 parent d52e3c8 commit cbaf028

1 file changed

Lines changed: 32 additions & 12 deletions

File tree

‎Cppcheck.xcodeproj/project.pbxproj‎

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
F4043DB2177F08A800CD5A40 /* pathmatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4043DAF177F08A800CD5A40 /* pathmatch.cpp */; };
3636
F4043DD7177F093300CD5A40 /* check64bit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4043DB3177F093300CD5A40 /* check64bit.cpp */; };
3737
F4043DD8177F093300CD5A40 /* checkassert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4043DB5177F093300CD5A40 /* checkassert.cpp */; };
38-
F4043DD9177F093300CD5A40 /* checkassignif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4043DB7177F093300CD5A40 /* checkassignif.cpp */; };
3938
F4043DDA177F093300CD5A40 /* checkbool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4043DB9177F093300CD5A40 /* checkbool.cpp */; };
4039
F4043DDB177F093300CD5A40 /* checkboost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4043DBB177F093300CD5A40 /* checkboost.cpp */; };
4140
F4043DDC177F093300CD5A40 /* checkinternal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4043DBD177F093300CD5A40 /* checkinternal.cpp */; };
@@ -51,6 +50,11 @@
5150
F4043DE6177F093300CD5A40 /* templatesimplifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4043DD2177F093300CD5A40 /* templatesimplifier.cpp */; };
5251
F4043DE7177F093300CD5A40 /* tokenlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4043DD4177F093300CD5A40 /* tokenlist.cpp */; };
5352
F47E508317896AEB00C684DC /* tinyxml2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F47E508117896AEB00C684DC /* tinyxml2.cpp */; };
53+
F497C28C1AB41D5C003B96CF /* check.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F497C2831AB41D5C003B96CF /* check.cpp */; };
54+
F497C28D1AB41D5C003B96CF /* checkcondition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F497C2841AB41D5C003B96CF /* checkcondition.cpp */; };
55+
F497C28E1AB41D5C003B96CF /* checkstring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F497C2861AB41D5C003B96CF /* checkstring.cpp */; };
56+
F497C28F1AB41D5C003B96CF /* checktype.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F497C2881AB41D5C003B96CF /* checktype.cpp */; };
57+
F497C2901AB41D5C003B96CF /* checkvaarg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F497C2891AB41D5C003B96CF /* checkvaarg.cpp */; };
5458
F4C348661825679E00521683 /* cmdlineparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39E60ECF1270DE5000AC0D02 /* cmdlineparser.cpp */; };
5559
F4C348671825679F00521683 /* cppcheckexecutor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39E60ED11270DE5000AC0D02 /* cppcheckexecutor.cpp */; };
5660
F4C348681825679F00521683 /* filelister.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4043DAD177F08A800CD5A40 /* filelister.cpp */; };
@@ -105,7 +109,6 @@
105109
F4C3489A1825692B00521683 /* testunusedvar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F45BDDB617AB8511006C06AF /* testunusedvar.cpp */; };
106110
F4C3489B18256A4500521683 /* check64bit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4043DB3177F093300CD5A40 /* check64bit.cpp */; };
107111
F4C3489C18256A4500521683 /* checkassert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4043DB5177F093300CD5A40 /* checkassert.cpp */; };
108-
F4C3489D18256A4500521683 /* checkassignif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4043DB7177F093300CD5A40 /* checkassignif.cpp */; };
109112
F4C3489E18256A4500521683 /* checkautovariables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39E60E8D1270DE3A00AC0D02 /* checkautovariables.cpp */; };
110113
F4C3489F18256A4500521683 /* checkbool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4043DB9177F093300CD5A40 /* checkbool.cpp */; };
111114
F4C348A018256A4500521683 /* checkboost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4043DBB177F093300CD5A40 /* checkboost.cpp */; };
@@ -226,8 +229,6 @@
226229
F4043DB4177F093300CD5A40 /* check64bit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = check64bit.h; path = lib/check64bit.h; sourceTree = "<group>"; };
227230
F4043DB5177F093300CD5A40 /* checkassert.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = checkassert.cpp; path = lib/checkassert.cpp; sourceTree = "<group>"; };
228231
F4043DB6177F093300CD5A40 /* checkassert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = checkassert.h; path = lib/checkassert.h; sourceTree = "<group>"; };
229-
F4043DB7177F093300CD5A40 /* checkassignif.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = checkassignif.cpp; path = lib/checkassignif.cpp; sourceTree = "<group>"; };
230-
F4043DB8177F093300CD5A40 /* checkassignif.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = checkassignif.h; path = lib/checkassignif.h; sourceTree = "<group>"; };
231232
F4043DB9177F093300CD5A40 /* checkbool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = checkbool.cpp; path = lib/checkbool.cpp; sourceTree = "<group>"; };
232233
F4043DBA177F093300CD5A40 /* checkbool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = checkbool.h; path = lib/checkbool.h; sourceTree = "<group>"; };
233234
F4043DBB177F093300CD5A40 /* checkboost.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = checkboost.cpp; path = lib/checkboost.cpp; sourceTree = "<group>"; };
@@ -311,6 +312,15 @@
311312
F45BDDB617AB8511006C06AF /* testunusedvar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testunusedvar.cpp; path = test/testunusedvar.cpp; sourceTree = "<group>"; };
312313
F47E508117896AEB00C684DC /* tinyxml2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = tinyxml2.cpp; path = externals/tinyxml/tinyxml2.cpp; sourceTree = "<group>"; };
313314
F47E508217896AEB00C684DC /* tinyxml2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tinyxml2.h; path = externals/tinyxml/tinyxml2.h; sourceTree = "<group>"; };
315+
F497C2831AB41D5C003B96CF /* check.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = check.cpp; path = lib/check.cpp; sourceTree = "<group>"; };
316+
F497C2841AB41D5C003B96CF /* checkcondition.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = checkcondition.cpp; path = lib/checkcondition.cpp; sourceTree = "<group>"; };
317+
F497C2851AB41D5C003B96CF /* checkcondition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = checkcondition.h; path = lib/checkcondition.h; sourceTree = "<group>"; };
318+
F497C2861AB41D5C003B96CF /* checkstring.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = checkstring.cpp; path = lib/checkstring.cpp; sourceTree = "<group>"; };
319+
F497C2871AB41D5C003B96CF /* checkstring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = checkstring.h; path = lib/checkstring.h; sourceTree = "<group>"; };
320+
F497C2881AB41D5C003B96CF /* checktype.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = checktype.cpp; path = lib/checktype.cpp; sourceTree = "<group>"; };
321+
F497C2891AB41D5C003B96CF /* checkvaarg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = checkvaarg.cpp; path = lib/checkvaarg.cpp; sourceTree = "<group>"; };
322+
F497C28A1AB41D5C003B96CF /* checkvaarg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = checkvaarg.h; path = lib/checkvaarg.h; sourceTree = "<group>"; };
323+
F497C28B1AB41D5C003B96CF /* cxx11emu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cxx11emu.h; path = lib/cxx11emu.h; sourceTree = "<group>"; };
314324
F4C34860182566E800521683 /* testrunner */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testrunner; sourceTree = BUILT_PRODUCTS_DIR; };
315325
F4CDD6961880888F006CF685 /* valueflow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = valueflow.cpp; path = lib/valueflow.cpp; sourceTree = "<group>"; };
316326
F4CDD6971880888F006CF685 /* valueflow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = valueflow.h; path = lib/valueflow.h; sourceTree = "<group>"; };
@@ -390,6 +400,15 @@
390400
2C21A45D1178BB0B00D35009 /* Library */ = {
391401
isa = PBXGroup;
392402
children = (
403+
F497C2831AB41D5C003B96CF /* check.cpp */,
404+
F497C2841AB41D5C003B96CF /* checkcondition.cpp */,
405+
F497C2851AB41D5C003B96CF /* checkcondition.h */,
406+
F497C2861AB41D5C003B96CF /* checkstring.cpp */,
407+
F497C2871AB41D5C003B96CF /* checkstring.h */,
408+
F497C2881AB41D5C003B96CF /* checktype.cpp */,
409+
F497C2891AB41D5C003B96CF /* checkvaarg.cpp */,
410+
F497C28A1AB41D5C003B96CF /* checkvaarg.h */,
411+
F497C28B1AB41D5C003B96CF /* cxx11emu.h */,
393412
F4CDD6961880888F006CF685 /* valueflow.cpp */,
394413
F4CDD6971880888F006CF685 /* valueflow.h */,
395414
F4CF847A17B6504000522F24 /* config.h */,
@@ -400,8 +419,6 @@
400419
F4043DB4177F093300CD5A40 /* check64bit.h */,
401420
F4043DB5177F093300CD5A40 /* checkassert.cpp */,
402421
F4043DB6177F093300CD5A40 /* checkassert.h */,
403-
F4043DB7177F093300CD5A40 /* checkassignif.cpp */,
404-
F4043DB8177F093300CD5A40 /* checkassignif.h */,
405422
39E60E8D1270DE3A00AC0D02 /* checkautovariables.cpp */,
406423
39E60E8E1270DE3A00AC0D02 /* checkautovariables.h */,
407424
F4043DB9177F093300CD5A40 /* checkbool.cpp */,
@@ -616,7 +633,7 @@
616633
08FB7793FE84155DC02AAC07 /* Project object */ = {
617634
isa = PBXProject;
618635
attributes = {
619-
LastUpgradeCheck = 0460;
636+
LastUpgradeCheck = 0620;
620637
};
621638
buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "Cppcheck" */;
622639
compatibilityVersion = "Xcode 3.2";
@@ -648,6 +665,7 @@
648665
39E60EBB1270DE3A00AC0D02 /* checkclass.cpp in Sources */,
649666
F4CDD6981880888F006CF685 /* valueflow.cpp in Sources */,
650667
39E60EBC1270DE3A00AC0D02 /* checkexceptionsafety.cpp in Sources */,
668+
F497C28E1AB41D5C003B96CF /* checkstring.cpp in Sources */,
651669
39E60EBD1270DE3A00AC0D02 /* checkmemoryleak.cpp in Sources */,
652670
39E60EBE1270DE3A00AC0D02 /* checkobsolescentfunctions.cpp in Sources */,
653671
39E60EBF1270DE3A00AC0D02 /* checkother.cpp in Sources */,
@@ -657,6 +675,8 @@
657675
39E60EC31270DE3A00AC0D02 /* cppcheck.cpp in Sources */,
658676
39E60EC41270DE3A00AC0D02 /* errorlogger.cpp in Sources */,
659677
39E60EC51270DE3A00AC0D02 /* executionpath.cpp in Sources */,
678+
F497C28C1AB41D5C003B96CF /* check.cpp in Sources */,
679+
F497C28D1AB41D5C003B96CF /* checkcondition.cpp in Sources */,
660680
39E60EC81270DE3A00AC0D02 /* mathlib.cpp in Sources */,
661681
39E60EC91270DE3A00AC0D02 /* path.cpp in Sources */,
662682
39E60ECA1270DE3A00AC0D02 /* preprocessor.cpp in Sources */,
@@ -672,7 +692,7 @@
672692
F4043DB2177F08A800CD5A40 /* pathmatch.cpp in Sources */,
673693
F4043DD7177F093300CD5A40 /* check64bit.cpp in Sources */,
674694
F4043DD8177F093300CD5A40 /* checkassert.cpp in Sources */,
675-
F4043DD9177F093300CD5A40 /* checkassignif.cpp in Sources */,
695+
F497C2901AB41D5C003B96CF /* checkvaarg.cpp in Sources */,
676696
F4043DDA177F093300CD5A40 /* checkbool.cpp in Sources */,
677697
F4043DDB177F093300CD5A40 /* checkboost.cpp in Sources */,
678698
F4043DDC177F093300CD5A40 /* checkinternal.cpp in Sources */,
@@ -685,6 +705,7 @@
685705
F4043DE3177F093300CD5A40 /* checkunusedvar.cpp in Sources */,
686706
F4043DE4177F093300CD5A40 /* suppressions.cpp in Sources */,
687707
F4043DE5177F093300CD5A40 /* symboldatabase.cpp in Sources */,
708+
F497C28F1AB41D5C003B96CF /* checktype.cpp in Sources */,
688709
F4043DE6177F093300CD5A40 /* templatesimplifier.cpp in Sources */,
689710
F4043DE7177F093300CD5A40 /* tokenlist.cpp in Sources */,
690711
F47E508317896AEB00C684DC /* tinyxml2.cpp in Sources */,
@@ -702,7 +723,6 @@
702723
F4C348C018256A8700521683 /* library.cpp in Sources */,
703724
F4C3489B18256A4500521683 /* check64bit.cpp in Sources */,
704725
F4C3489C18256A4500521683 /* checkassert.cpp in Sources */,
705-
F4C3489D18256A4500521683 /* checkassignif.cpp in Sources */,
706726
F4C3489E18256A4500521683 /* checkautovariables.cpp in Sources */,
707727
F4C3489F18256A4500521683 /* checkbool.cpp in Sources */,
708728
F4C348A018256A4500521683 /* checkboost.cpp in Sources */,
@@ -827,10 +847,10 @@
827847
1DEB923608733DC60010E9CD /* Debug */ = {
828848
isa = XCBuildConfiguration;
829849
buildSettings = {
830-
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
850+
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
831851
GCC_C_LANGUAGE_STANDARD = gnu99;
832852
GCC_OPTIMIZATION_LEVEL = 0;
833-
GCC_VERSION = 4.0;
853+
GCC_VERSION = "";
834854
GCC_WARN_ABOUT_RETURN_TYPE = YES;
835855
GCC_WARN_UNUSED_VARIABLE = YES;
836856
ONLY_ACTIVE_ARCH = YES;
@@ -841,7 +861,7 @@
841861
1DEB923708733DC60010E9CD /* Release */ = {
842862
isa = XCBuildConfiguration;
843863
buildSettings = {
844-
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
864+
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
845865
GCC_C_LANGUAGE_STANDARD = gnu99;
846866
GCC_WARN_ABOUT_RETURN_TYPE = YES;
847867
GCC_WARN_UNUSED_VARIABLE = YES;

0 commit comments

Comments
 (0)