[iOS] Upstream gtest

<http://webkit.org/b/126811>

Reviewed by Mark Rowe.

* gtest/xcode/Config/General.xcconfig: Include iOS.xcconfig.
* gtest/xcode/Config/iOS.xcconfig: Added.
* gtest/xcode/gtest.xcodeproj/project.pbxproj: Add iOS.xcconfig.
Sort.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@161777 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/ThirdParty/ChangeLog b/Source/ThirdParty/ChangeLog
index 28b23bf318c02ef766600c5744da99fd1be0f35c..24c8d69364bc740a22c466117d9f450a4b119ba2 100644 (file)
--- a/Source/ThirdParty/ChangeLog
+++ b/Source/ThirdParty/ChangeLog
@@ -1,3 +1,15 @@
+2014-01-11  David Kilzer  <ddkilzer@apple.com>
+
+        [iOS] Upstream gtest
+        <http://webkit.org/b/126811>
+
+        Reviewed by Mark Rowe.
+
+        * gtest/xcode/Config/General.xcconfig: Include iOS.xcconfig.
+        * gtest/xcode/Config/iOS.xcconfig: Added.
+        * gtest/xcode/gtest.xcodeproj/project.pbxproj: Add iOS.xcconfig.
+        Sort.
+
 2013-12-13  Brent Fulgham  <bfulgham@apple.com>
 
         [Win] Switch WebKit solution to Visual Studio 2013

diff --git a/Source/ThirdParty/gtest/xcode/Config/General.xcconfig b/Source/ThirdParty/gtest/xcode/Config/General.xcconfig
index 1a9682a9b1117ab3f4299d6d1144f84f82ab9930..48c1e9ae8736f40bd56bbb1541c96352a2da23ee 100644 (file)
--- a/Source/ThirdParty/gtest/xcode/Config/General.xcconfig
+++ b/Source/ThirdParty/gtest/xcode/Config/General.xcconfig
@@ -5,7 +5,9 @@
 //  examples.
 //  This file is based on the Xcode Configuration files in:
 //  http://code.google.com/p/google-toolbox-for-mac/
-// 
+//
+
+#include "iOS.xcconfig"
 
 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 

diff --git a/Source/ThirdParty/gtest/xcode/Config/iOS.xcconfig b/Source/ThirdParty/gtest/xcode/Config/iOS.xcconfig
new file mode 100644 (file)
index 0000000..177b319
--- /dev/null
+++ b/Source/ThirdParty/gtest/xcode/Config/iOS.xcconfig
@@ -0,0 +1 @@
+#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"

diff --git a/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj b/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj
index 397d1d0e75efec67a366e0c6447ae5bb1b4a62c2..343b40dec6b43a33f67ce5b9a70da1b00343f30e 100644 (file)
--- a/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj
+++ b/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj
@@ -202,6 +202,7 @@
                1A0A4C4414B7A3B500895135 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
                224A12A10E9EADA700BD17FD /* gtest-all.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = "gtest-all.cc"; sourceTree = "<group>"; };
                224A12A20E9EADCC00BD17FD /* gtest-test-part.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = "gtest-test-part.h"; sourceTree = "<group>"; };
+               299E51021790C981006F6AFE /* iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; };
                3B238C120E7FE13C00846E11 /* gtest_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gtest_unittest.cc; sourceTree = "<group>"; };
                3B87D2100E96B92E000D1852 /* runtests.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = runtests.sh; sourceTree = "<group>"; };
                3BF6F29F0E79B5AD000F2EEE /* gtest-type-util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-type-util.h"; sourceTree = "<group>"; };
@@ -433,6 +434,7 @@
                                40D4CDF10E30E07400294801 /* DebugProject.xcconfig */,
                                40D4CDF20E30E07400294801 /* FrameworkTarget.xcconfig */,
                                40D4CDF30E30E07400294801 /* General.xcconfig */,
+                               299E51021790C981006F6AFE /* iOS.xcconfig */,
                                44C48DFF14A4098F00A2D9C7 /* ProductionProject.xcconfig */,
                                40D4CDF40E30E07400294801 /* ReleaseProject.xcconfig */,
                                40899FB30FFA7567000B29AE /* StaticLibraryTarget.xcconfig */,