Changeset 194585 in webkit


Ignore:
Timestamp:
Jan 5, 2016 9:14:28 AM (8 years ago)
Author:
ap@apple.com
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:
Location:
trunk/Source/ThirdParty
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/ThirdParty/ChangeLog

    r194501 r194585  
     12016-01-04  Alexey Proskuryakov  <ap@apple.com>
     2
     3        gtest should use the same SDK as other projects
     4        https://bugs.webkit.org/show_bug.cgi?id=152718
     5        rdar://problem/23566856
     6
     7        Reviewed by Alex Christensen.
     8
     9        gtest configuration attempted to use USE_INTERNAL_SDK without ever defining it.
     10
     11        * gtest/xcode/Config/DebugProject.xcconfig:
     12        * gtest/xcode/Config/General.xcconfig:
     13        * gtest/xcode/Config/ReleaseProject.xcconfig:
     14
    1152016-01-02  Ting-Wei Lan  <lantw44@gmail.com>
    216

  • trunk/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig

    r104171 r194585  
    3434
    3535ONLY_ACTIVE_ARCH = YES
     36
     37SDKROOT[sdk=iphone*] = $(SDKROOT);
     38SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
     39SDKROOT_macosx_ = macosx;
     40SDKROOT_macosx_YES = macosx.internal;

  • trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig

    r192889 r194585  
    77//  http://code.google.com/p/google-toolbox-for-mac/
    88//
     9
     10#include "../../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
     11
     12USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
     13USE_INTERNAL_SDK_Production = YES;
     14USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
     15USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
    916
    1017GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
    … …  
    6673OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
    6774
    68 SDKROOT[sdk=iphone*] = $(SDKROOT);
    69 SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
    70 SDKROOT_macosx_ = macosx;
    71 SDKROOT_macosx_YES = macosx.internal;
    72 
    7375SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;

  • trunk/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig

    r104171 r194585  
    3636
    3737ONLY_ACTIVE_ARCH = YES
     38
     39SDKROOT[sdk=iphone*] = $(SDKROOT);
     40SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
     41SDKROOT_macosx_ = macosx;
     42SDKROOT_macosx_YES = macosx.internal;
Note: See TracChangeset for help on using the changeset viewer.