projects / platform / upstream / gtest.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[Gtest][Latest version 1.8.0 build successfully for all four architechtures - armv7l...
[platform/upstream/gtest.git] / xcode / gtest.xcodeproj / project.pbxproj
diff --git a/xcode/gtest.xcodeproj/project.pbxproj b/xcode/gtest.xcodeproj/project.pbxproj
index 74a7815..aefaa88 100755 (executable)
--- a/xcode/gtest.xcodeproj/project.pbxproj
+++ b/xcode/gtest.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
        archiveVersion = 1;
        classes = {
        };
-       objectVersion = 42;
+       objectVersion = 46;
        objects = {
 
 /* Begin PBXAggregateTarget section */
@@ -46,7 +46,7 @@
                4048843B0E2F799B00CF7658 /* gtest.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883DE0E2F799B00CF7658 /* gtest.h */; settings = {ATTRIBUTES = (Public, ); }; };
                4048843C0E2F799B00CF7658 /* gtest_pred_impl.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883DF0E2F799B00CF7658 /* gtest_pred_impl.h */; settings = {ATTRIBUTES = (Public, ); }; };
                4048843D0E2F799B00CF7658 /* gtest_prod.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883E00E2F799B00CF7658 /* gtest_prod.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               404884500E2F799B00CF7658 /* README in Resources */ = {isa = PBXBuildFile; fileRef = 404883F60E2F799B00CF7658 /* README */; };
+               404884500E2F799B00CF7658 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 404883F60E2F799B00CF7658 /* README.md */; };
                404884A00E2F7BE600CF7658 /* gtest-death-test-internal.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E20E2F799B00CF7658 /* gtest-death-test-internal.h */; };
                404884A10E2F7BE600CF7658 /* gtest-filepath.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E30E2F799B00CF7658 /* gtest-filepath.h */; };
                404884A20E2F7BE600CF7658 /* gtest-internal.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E40E2F799B00CF7658 /* gtest-internal.h */; };
@@ -54,7 +54,7 @@
                404884A40E2F7BE600CF7658 /* gtest-string.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E60E2F799B00CF7658 /* gtest-string.h */; };
                404884AC0E2F7CD900CF7658 /* CHANGES in Resources */ = {isa = PBXBuildFile; fileRef = 404884A90E2F7CD900CF7658 /* CHANGES */; };
                404884AD0E2F7CD900CF7658 /* CONTRIBUTORS in Resources */ = {isa = PBXBuildFile; fileRef = 404884AA0E2F7CD900CF7658 /* CONTRIBUTORS */; };
-               404884AE0E2F7CD900CF7658 /* COPYING in Resources */ = {isa = PBXBuildFile; fileRef = 404884AB0E2F7CD900CF7658 /* COPYING */; };
+               404884AE0E2F7CD900CF7658 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 404884AB0E2F7CD900CF7658 /* LICENSE */; };
                40899F3A0FFA70D4000B29AE /* gtest-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = 224A12A10E9EADA700BD17FD /* gtest-all.cc */; };
                40899F500FFA7281000B29AE /* gtest-tuple.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 40899F4D0FFA7271000B29AE /* gtest-tuple.h */; };
                40899F530FFA72A0000B29AE /* gtest_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3B238C120E7FE13C00846E11 /* gtest_unittest.cc */; };
@@ -217,11 +217,11 @@
                404883E40E2F799B00CF7658 /* gtest-internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-internal.h"; sourceTree = "<group>"; };
                404883E50E2F799B00CF7658 /* gtest-port.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-port.h"; sourceTree = "<group>"; };
                404883E60E2F799B00CF7658 /* gtest-string.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-string.h"; sourceTree = "<group>"; };
-               404883F60E2F799B00CF7658 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = README; path = ../README; sourceTree = SOURCE_ROOT; };
+               404883F60E2F799B00CF7658 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = README.md; path = ../README.md; sourceTree = SOURCE_ROOT; };
                4048840D0E2F799B00CF7658 /* gtest_main.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gtest_main.cc; sourceTree = "<group>"; };
                404884A90E2F7CD900CF7658 /* CHANGES */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CHANGES; path = ../CHANGES; sourceTree = SOURCE_ROOT; };
                404884AA0E2F7CD900CF7658 /* CONTRIBUTORS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CONTRIBUTORS; path = ../CONTRIBUTORS; sourceTree = SOURCE_ROOT; };
-               404884AB0E2F7CD900CF7658 /* COPYING */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = COPYING; path = ../COPYING; sourceTree = SOURCE_ROOT; };
+               404884AB0E2F7CD900CF7658 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = SOURCE_ROOT; };
                40899F430FFA7184000B29AE /* gtest_unittest-framework */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "gtest_unittest-framework"; sourceTree = BUILT_PRODUCTS_DIR; };
                40899F4D0FFA7271000B29AE /* gtest-tuple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-tuple.h"; sourceTree = "<group>"; };
                40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = StaticLibraryTarget.xcconfig; sourceTree = "<group>"; };
@@ -317,8 +317,8 @@
                        children = (
                                404884A90E2F7CD900CF7658 /* CHANGES */,
                                404884AA0E2F7CD900CF7658 /* CONTRIBUTORS */,
-                               404884AB0E2F7CD900CF7658 /* COPYING */,
-                               404883F60E2F799B00CF7658 /* README */,
+                               404884AB0E2F7CD900CF7658 /* LICENSE */,
+                               404883F60E2F799B00CF7658 /* README.md */,
                                404883D90E2F799B00CF7658 /* include */,
                                4089A02F0FFACF84000B29AE /* samples */,
                                404884070E2F799B00CF7658 /* src */,
@@ -580,8 +580,12 @@
 /* Begin PBXProject section */
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
+                       attributes = {
+                               LastUpgradeCheck = 0460;
+                       };
                        buildConfigurationList = 4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "gtest" */;
-                       compatibilityVersion = "Xcode 2.4";
+                       compatibilityVersion = "Xcode 3.2";
+                       developmentRegion = English;
                        hasScannedForEncodings = 1;
                        knownRegions = (
                                English,
@@ -613,10 +617,10 @@
                        isa = PBXResourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               404884500E2F799B00CF7658 /* README in Resources */,
+                               404884500E2F799B00CF7658 /* README.md in Resources */,
                                404884AC0E2F7CD900CF7658 /* CHANGES in Resources */,
                                404884AD0E2F7CD900CF7658 /* CONTRIBUTORS in Resources */,
-                               404884AE0E2F7CD900CF7658 /* COPYING in Resources */,
+                               404884AE0E2F7CD900CF7658 /* LICENSE in Resources */,
                                40C84978101A36540083642A /* libgtest_main.a in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
@@ -789,20 +793,25 @@
                3B238F600E828B5400846E11 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               COMBINE_HIDPI_IMAGES = YES;
                                COPY_PHASE_STRIP = NO;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_OPTIMIZATION_LEVEL = 0;
+                               GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
                                PRODUCT_NAME = Check;
+                               SDKROOT = macosx;
                        };
                        name = Debug;
                };
                3B238F610E828B5400846E11 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               COMBINE_HIDPI_IMAGES = YES;
                                COPY_PHASE_STRIP = YES;
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
+                               GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
                                PRODUCT_NAME = Check;
+                               SDKROOT = macosx;
                                ZERO_LINK = NO;
                        };
                        name = Release;
@@ -810,37 +819,49 @@
                40899F450FFA7185000B29AE /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
                                HEADER_SEARCH_PATHS = ../;
                                PRODUCT_NAME = "gtest_unittest-framework";
+                               SDKROOT = macosx;
                        };
                        name = Debug;
                };
                40899F460FFA7185000B29AE /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
                                HEADER_SEARCH_PATHS = ../;
                                PRODUCT_NAME = "gtest_unittest-framework";
+                               SDKROOT = macosx;
                        };
                        name = Release;
                };
                4089A0150FFACEFD000B29AE /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
                                PRODUCT_NAME = "sample1_unittest-framework";
+                               SDKROOT = macosx;
                        };
                        name = Debug;
                };
                4089A0160FFACEFD000B29AE /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
                                PRODUCT_NAME = "sample1_unittest-framework";
+                               SDKROOT = macosx;
                        };
                        name = Release;
                };
                40C44ADF0E3798F4008FCC51 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               COMBINE_HIDPI_IMAGES = YES;
+                               GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+                               MACOSX_DEPLOYMENT_TARGET = 10.7;
                                PRODUCT_NAME = gtest;
+                               SDKROOT = macosx;
                                TARGET_NAME = gtest;
                        };
                        name = Debug;
@@ -848,7 +869,11 @@
                40C44AE00E3798F4008FCC51 /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               COMBINE_HIDPI_IMAGES = YES;
+                               GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+                               MACOSX_DEPLOYMENT_TARGET = 10.7;
                                PRODUCT_NAME = gtest;
+                               SDKROOT = macosx;
                                TARGET_NAME = gtest;
                        };
                        name = Release;
@@ -857,13 +882,16 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */;
                        buildSettings = {
+                               COMBINE_HIDPI_IMAGES = YES;
                                GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+                               GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
                                HEADER_SEARCH_PATHS = (
                                        ../,
                                        ../include/,
                                );
                                PRODUCT_NAME = gtest;
+                               SDKROOT = macosx;
                        };
                        name = Debug;
                };
@@ -871,13 +899,16 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */;
                        buildSettings = {
+                               COMBINE_HIDPI_IMAGES = YES;
                                GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+                               GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
                                HEADER_SEARCH_PATHS = (
                                        ../,
                                        ../include/,
                                );
                                PRODUCT_NAME = gtest;
+                               SDKROOT = macosx;
                        };
                        name = Release;
                };
@@ -885,11 +916,14 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */;
                        buildSettings = {
+                               COMBINE_HIDPI_IMAGES = YES;
+                               GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
                                HEADER_SEARCH_PATHS = (
                                        ../,
                                        ../include/,
                                );
                                PRODUCT_NAME = gtest_main;
+                               SDKROOT = macosx;
                        };
                        name = Debug;
                };
@@ -897,41 +931,52 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */;
                        buildSettings = {
+                               COMBINE_HIDPI_IMAGES = YES;
+                               GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
                                HEADER_SEARCH_PATHS = (
                                        ../,
                                        ../include/,
                                );
                                PRODUCT_NAME = gtest_main;
+                               SDKROOT = macosx;
                        };
                        name = Release;
                };
                40C84985101A36850083642A /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
                                HEADER_SEARCH_PATHS = ../;
                                PRODUCT_NAME = gtest_unittest;
+                               SDKROOT = macosx;
                        };
                        name = Debug;
                };
                40C84986101A36850083642A /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
                                HEADER_SEARCH_PATHS = ../;
                                PRODUCT_NAME = gtest_unittest;
+                               SDKROOT = macosx;
                        };
                        name = Release;
                };
                40C84995101A36A60083642A /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
                                PRODUCT_NAME = "sample1_unittest-static";
+                               SDKROOT = macosx;
                        };
                        name = Debug;
                };
                40C84996101A36A60083642A /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
                                PRODUCT_NAME = "sample1_unittest-static";
+                               SDKROOT = macosx;
                        };
                        name = Release;
                };
@@ -939,8 +984,10 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 40D4CDF20E30E07400294801 /* FrameworkTarget.xcconfig */;
                        buildSettings = {
+                               COMBINE_HIDPI_IMAGES = YES;
                                DYLIB_COMPATIBILITY_VERSION = 1;
                                DYLIB_CURRENT_VERSION = 1;
+                               GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
                                HEADER_SEARCH_PATHS = (
                                        ../,
                                        ../include/,
@@ -949,6 +996,7 @@
                                INFOPLIST_PREFIX_HEADER = "$(PROJECT_TEMP_DIR)/Version.h";
                                INFOPLIST_PREPROCESS = YES;
                                PRODUCT_NAME = gtest;
+                               SDKROOT = macosx;
                                VERSIONING_SYSTEM = "apple-generic";
                        };
                        name = Debug;
@@ -957,8 +1005,10 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 40D4CDF20E30E07400294801 /* FrameworkTarget.xcconfig */;
                        buildSettings = {
+                               COMBINE_HIDPI_IMAGES = YES;
                                DYLIB_COMPATIBILITY_VERSION = 1;
                                DYLIB_CURRENT_VERSION = 1;
+                               GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
                                HEADER_SEARCH_PATHS = (
                                        ../,
                                        ../include/,
@@ -967,6 +1017,7 @@
                                INFOPLIST_PREFIX_HEADER = "$(PROJECT_TEMP_DIR)/Version.h";
                                INFOPLIST_PREPROCESS = YES;
                                PRODUCT_NAME = gtest;
+                               SDKROOT = macosx;
                                VERSIONING_SYSTEM = "apple-generic";
                        };
                        name = Release;
Domain: System / Base;