Updates gtest.xcodeproj to be compatible with OS X 10.8.4 & Xcode 4.6.3
diff --git a/xcode/gtest.xcodeproj/project.pbxproj b/xcode/gtest.xcodeproj/project.pbxproj
index da6455b..0452a63 100644
--- 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 */
@@ -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,
@@ -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;
