Title: [161777] trunk/Source/ThirdParty
- Revision
- 161777
- Author
- [email protected]
- Date
- 2014-01-11 12:56:27 -0800 (Sat, 11 Jan 2014)
Log Message
[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.
Modified Paths
Added Paths
Diff
Modified: trunk/Source/ThirdParty/ChangeLog (161776 => 161777)
--- trunk/Source/ThirdParty/ChangeLog 2014-01-11 20:31:54 UTC (rev 161776)
+++ trunk/Source/ThirdParty/ChangeLog 2014-01-11 20:56:27 UTC (rev 161777)
@@ -1,3 +1,15 @@
+2014-01-11 David Kilzer <[email protected]>
+
+ [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 <[email protected]>
[Win] Switch WebKit solution to Visual Studio 2013
Modified: trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig (161776 => 161777)
--- trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig 2014-01-11 20:31:54 UTC (rev 161776)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig 2014-01-11 20:56:27 UTC (rev 161777)
@@ -5,8 +5,10 @@
// 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;
ARCHS = $(ARCHS_STANDARD_32_64_BIT);
Added: trunk/Source/ThirdParty/gtest/xcode/Config/iOS.xcconfig (0 => 161777)
--- trunk/Source/ThirdParty/gtest/xcode/Config/iOS.xcconfig (rev 0)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/iOS.xcconfig 2014-01-11 20:56:27 UTC (rev 161777)
@@ -0,0 +1 @@
+#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
Modified: trunk/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj (161776 => 161777)
--- trunk/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj 2014-01-11 20:31:54 UTC (rev 161776)
+++ trunk/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj 2014-01-11 20:56:27 UTC (rev 161777)
@@ -202,6 +202,7 @@
1A0A4C4414B7A3B500895135 /* _javascript_Core.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = _javascript_Core.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 */,
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
