diff --git a/ThirdParty/gtest/gtest-1.6.0/xcode/gtest.xcodeproj/project.pbxproj b/ThirdParty/gtest/gtest-1.6.0/xcode/gtest.xcodeproj/project.pbxproj
index 53d2e5c6be7ed72285f3ef2930d8faf4fa646c22..7b95c2246f10dea848c747297206257d61c6418b 100644
--- a/ThirdParty/gtest/gtest-1.6.0/xcode/gtest.xcodeproj/project.pbxproj
+++ b/ThirdParty/gtest/gtest-1.6.0/xcode/gtest.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 42;
+ objectVersion = 46;
objects = {
/* Begin PBXAggregateTarget section */
@@ -622,8 +622,11 @@
/* Begin PBXProject section */
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0440;
+ };
buildConfigurationList = 4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "gtest" */;
- compatibilityVersion = "Xcode 2.4";
+ compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
@@ -841,9 +844,11 @@
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;
};
name = Debug;
@@ -851,9 +856,10 @@
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;
ZERO_LINK = NO;
};
@@ -862,6 +868,7 @@
40899F450FFA7185000B29AE /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = ../;
PRODUCT_NAME = "gtest_unittest-framework";
};
@@ -870,6 +877,7 @@
40899F460FFA7185000B29AE /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = ../;
PRODUCT_NAME = "gtest_unittest-framework";
};
@@ -878,6 +886,7 @@
4089A0150FFACEFD000B29AE /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
PRODUCT_NAME = "sample1_unittest-framework";
};
name = Debug;
@@ -885,6 +894,7 @@
4089A0160FFACEFD000B29AE /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
PRODUCT_NAME = "sample1_unittest-framework";
};
name = Release;
@@ -892,7 +902,8 @@
40C44ADF0E3798F4008FCC51 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- GCC_VERSION = com.apple.compilers.llvmgcc42;
+ COMBINE_HIDPI_IMAGES = YES;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
PRODUCT_NAME = gtest;
TARGET_NAME = gtest;
};
@@ -901,7 +912,8 @@
40C44AE00E3798F4008FCC51 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- GCC_VERSION = com.apple.compilers.llvmgcc42;
+ COMBINE_HIDPI_IMAGES = YES;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
PRODUCT_NAME = gtest;
TARGET_NAME = gtest;
};
@@ -911,9 +923,10 @@
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.llvmgcc42;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = (
../,
../include/,
@@ -926,9 +939,10 @@
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.llvmgcc42;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = (
../,
../include/,
@@ -941,7 +955,8 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */;
buildSettings = {
- GCC_VERSION = com.apple.compilers.llvmgcc42;
+ COMBINE_HIDPI_IMAGES = YES;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = (
../,
../include/,
@@ -954,7 +969,8 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */;
buildSettings = {
- GCC_VERSION = com.apple.compilers.llvmgcc42;
+ COMBINE_HIDPI_IMAGES = YES;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = (
../,
../include/,
@@ -966,6 +982,7 @@
40C84985101A36850083642A /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = ../;
PRODUCT_NAME = gtest_unittest;
};
@@ -974,6 +991,7 @@
40C84986101A36850083642A /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = ../;
PRODUCT_NAME = gtest_unittest;
};
@@ -982,6 +1000,7 @@
40C84995101A36A60083642A /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
PRODUCT_NAME = "sample1_unittest-static";
};
name = Debug;
@@ -989,6 +1008,7 @@
40C84996101A36A60083642A /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
PRODUCT_NAME = "sample1_unittest-static";
};
name = Release;
@@ -997,9 +1017,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.llvmgcc42;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = (
../,
../include/,
@@ -1016,9 +1037,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.llvmgcc42;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = (
../,
../include/,
@@ -1035,7 +1057,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 40D4CDF10E30E07400294801 /* DebugProject.xcconfig */;
buildSettings = {
- SDKROOT = "";
+ SDKROOT = macosx;
};
name = Debug;
};
@@ -1043,7 +1065,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 40D4CDF40E30E07400294801 /* ReleaseProject.xcconfig */;
buildSettings = {
- SDKROOT = "";
+ SDKROOT = macosx;
};
name = Release;
};
@@ -1051,6 +1073,7 @@
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;
@@ -1069,6 +1092,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
GCC_OPTIMIZATION_LEVEL = 2;
GCC_SYMBOLS_PRIVATE_EXTERN = YES;