gtest should use the same SDK as other projects
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 5 Jan 2016 17:14:28 +0000 (17:14 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 5 Jan 2016 17:14:28 +0000 (17:14 +0000)
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:

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

Source/ThirdParty/ChangeLog
Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig
Source/ThirdParty/gtest/xcode/Config/General.xcconfig
Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig

index 025f02d..62fa6ab 100644 (file)
@@ -1,3 +1,17 @@
+2016-01-04  Alexey Proskuryakov  <ap@apple.com>
+
+        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  <lantw44@gmail.com>
 
         Remove usage of environ in gtest
index d041f17..c040f5e 100644 (file)
@@ -33,3 +33,8 @@ OTHER_CFLAGS = $(OTHER_CFLAGS) -DDEBUG=1
 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;
index 52374f0..fd24eb6 100644 (file)
@@ -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_CFLAGS = $(ASAN_OTHER_CFLAGS);
 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;
index 8494769..ddd1617 100644 (file)
@@ -35,3 +35,8 @@ STRIP_STYLE = all
 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;