diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-03 09:55:33 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-03 09:55:33 +0100 |
| commit | cd44dc59cdfc39534aef4d417e9f3c412e3be139 (patch) | |
| tree | 8d89889ba95ed6ec9322e733846cc9cce9d7dff1 /Source/ThirdParty | |
| parent | d11f84f5b5cdc0d92a08af01b13472fdd5f9acb9 (diff) | |
| download | qtwebkit-cd44dc59cdfc39534aef4d417e9f3c412e3be139.tar.gz | |
Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560)
Diffstat (limited to 'Source/ThirdParty')
| -rw-r--r-- | Source/ThirdParty/ChangeLog | 12 | ||||
| -rw-r--r-- | Source/ThirdParty/gtest/xcode/Config/ProductionProject.xcconfig | 10 |
2 files changed, 21 insertions, 1 deletions
diff --git a/Source/ThirdParty/ChangeLog b/Source/ThirdParty/ChangeLog index c958581e1..02381969c 100644 --- a/Source/ThirdParty/ChangeLog +++ b/Source/ThirdParty/ChangeLog @@ -1,3 +1,15 @@ +2012-01-25 Mark Rowe <mrowe@apple.com> + + Build in to an alternate location when USE_STAGING_INSTALL_PATH is set. + + <rdar://problem/10609417> Adopt USE_STAGING_INSTALL_PATH + + Reviewed by David Kilzer. + + * gtest/xcode/Config/ProductionProject.xcconfig: Ensure that the staged frameworks path + is in the framework search path when USE_STAGING_INSTALL_PATH is set. Look for the WebCore + framework in the staged frameworks directory when USE_STAGING_INSTALL_PATH is set. + 2012-01-06 Anders Carlsson <andersca@apple.com> Make JavaScriptCore.framework a reference and put it in a Frameworks group diff --git a/Source/ThirdParty/gtest/xcode/Config/ProductionProject.xcconfig b/Source/ThirdParty/gtest/xcode/Config/ProductionProject.xcconfig index 4ba5cbb92..f8ae09bb1 100644 --- a/Source/ThirdParty/gtest/xcode/Config/ProductionProject.xcconfig +++ b/Source/ThirdParty/gtest/xcode/Config/ProductionProject.xcconfig @@ -11,6 +11,14 @@ #include "ReleaseProject.xcconfig" // Used by HEADER_SEARCH_PATHS in General.xcconfig -WEBCORE_PRIVATE_HEADERS_DIR = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks/WebCore.framework/PrivateHeaders; +WEBCORE_PRIVATE_HEADERS_DIR = $(WEBCORE_PRIVATE_HEADERS_DIR_$(USE_STAGING_INSTALL_PATH)); +WEBCORE_PRIVATE_HEADERS_DIR_ = $(WEBCORE_PRIVATE_HEADERS_DIR_NO); +WEBCORE_PRIVATE_HEADERS_DIR_NO = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks/WebCore.framework/PrivateHeaders; +WEBCORE_PRIVATE_HEADERS_DIR_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari/WebCore.framework/PrivateHeaders; + +FRAMEWORK_SEARCH_PATHS = $(STAGED_FRAMEWORKS_SEARCH_PATH) $(FRAMEWORK_SEARCH_PATHS); + +STAGED_FRAMEWORKS_SEARCH_PATH = $(STAGED_FRAMEWORKS_SEARCH_PATH_$(USE_STAGING_INSTALL_PATH)); +STAGED_FRAMEWORKS_SEARCH_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari; ONLY_ACTIVE_ARCH = NO |