Title: [194585] trunk/Source/ThirdParty
- Revision
- 194585
- Author
- [email protected]
- Date
- 2016-01-05 09:14:28 -0800 (Tue, 05 Jan 2016)
Log Message
gtest should use the same SDK as other projects
https://bugs.webkit.org/show_bug.cgi?id=152718
rdar://problem/23566856
Reviewed by Alex Christensen.
gtest configuration attempted to use USE_INTERNAL_SDK without ever defining it.
* gtest/xcode/Config/DebugProject.xcconfig:
* gtest/xcode/Config/General.xcconfig:
* gtest/xcode/Config/ReleaseProject.xcconfig:
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ChangeLog (194584 => 194585)
--- trunk/Source/ThirdParty/ChangeLog 2016-01-05 16:10:25 UTC (rev 194584)
+++ trunk/Source/ThirdParty/ChangeLog 2016-01-05 17:14:28 UTC (rev 194585)
@@ -1,3 +1,17 @@
+2016-01-04 Alexey Proskuryakov <[email protected]>
+
+ gtest should use the same SDK as other projects
+ https://bugs.webkit.org/show_bug.cgi?id=152718
+ rdar://problem/23566856
+
+ Reviewed by Alex Christensen.
+
+ gtest configuration attempted to use USE_INTERNAL_SDK without ever defining it.
+
+ * gtest/xcode/Config/DebugProject.xcconfig:
+ * gtest/xcode/Config/General.xcconfig:
+ * gtest/xcode/Config/ReleaseProject.xcconfig:
+
2016-01-02 Ting-Wei Lan <[email protected]>
Remove usage of environ in gtest
Modified: trunk/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig (194584 => 194585)
--- trunk/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig 2016-01-05 16:10:25 UTC (rev 194584)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig 2016-01-05 17:14:28 UTC (rev 194585)
@@ -33,3 +33,8 @@
WEBCORE_PRIVATE_HEADERS_DIR = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
_ONLY_ACTIVE_ARCH_ = YES
+
+SDKROOT[sdk=iphone*] = $(SDKROOT);
+SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
+SDKROOT_macosx_ = macosx;
+SDKROOT_macosx_YES = macosx.internal;
Modified: trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig (194584 => 194585)
--- trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig 2016-01-05 16:10:25 UTC (rev 194584)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig 2016-01-05 17:14:28 UTC (rev 194585)
@@ -7,6 +7,13 @@
// http://code.google.com/p/google-toolbox-for-mac/
//
+#include "../../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
+
+USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
+USE_INTERNAL_SDK_Production = YES;
+USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
+USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
+
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
ARCHS = $(ARCHS_STANDARD_32_64_BIT);
@@ -65,9 +72,4 @@
OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
-SDKROOT[sdk=iphone*] = $(SDKROOT);
-SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
-SDKROOT_macosx_ = macosx;
-SDKROOT_macosx_YES = macosx.internal;
-
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
Modified: trunk/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig (194584 => 194585)
--- trunk/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig 2016-01-05 16:10:25 UTC (rev 194584)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig 2016-01-05 17:14:28 UTC (rev 194585)
@@ -35,3 +35,8 @@
WEBCORE_PRIVATE_HEADERS_DIR = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
_ONLY_ACTIVE_ARCH_ = YES
+
+SDKROOT[sdk=iphone*] = $(SDKROOT);
+SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
+SDKROOT_macosx_ = macosx;
+SDKROOT_macosx_YES = macosx.internal;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
