Unreviewed, reverting r288606.
https://bugs.webkit.org/show_bug.cgi?id=235629
Should never have been committed
Reverted changeset:
"[WebGPU] Fix WGSLUnitTests build"
https://bugs.webkit.org/show_bug.cgi?id=235628
https://commits.webkit.org/r288606
Patch by Commit Queue <commit-queue@webkit.org> on 2022-01-25
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@288607 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebGPU/ChangeLog b/Source/WebGPU/ChangeLog
index 6b66a8d..3a26935 100644
--- a/Source/WebGPU/ChangeLog
+++ b/Source/WebGPU/ChangeLog
@@ -1,3 +1,16 @@
+2022-01-25 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, reverting r288606.
+ https://bugs.webkit.org/show_bug.cgi?id=235629
+
+ Should never have been committed
+
+ Reverted changeset:
+
+ "[WebGPU] Fix WGSLUnitTests build"
+ https://bugs.webkit.org/show_bug.cgi?id=235628
+ https://commits.webkit.org/r288606
+
2022-01-25 Myles C. Maxfield <mmaxfield@apple.com>
[WebGPU] Fix WGSLUnitTests build
diff --git a/Source/WebGPU/Configurations/Base.xcconfig b/Source/WebGPU/Configurations/Base.xcconfig
index 5a61bc7..2b30a69 100644
--- a/Source/WebGPU/Configurations/Base.xcconfig
+++ b/Source/WebGPU/Configurations/Base.xcconfig
@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2021 Apple Inc. All rights reserved.
+// Copyright (C) 2009-2022 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -163,3 +163,7 @@
WK_DEFAULT_LTO_MODE = $(WK_USER_LTO_MODE_thin);
NORMAL_WEBGPU_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+
+WGSL_INSTALL_PATH_PREFIX = $(WGSL_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION));
+WGSL_INSTALL_PATH_PREFIX_DEPLOYMENT_YES = $(WGSL_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+WGSL_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
diff --git a/Source/WebGPU/Configurations/WGSL.xcconfig b/Source/WebGPU/Configurations/WGSL.xcconfig
index df900ec..b665fe3 100644
--- a/Source/WebGPU/Configurations/WGSL.xcconfig
+++ b/Source/WebGPU/Configurations/WGSL.xcconfig
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2021 Apple Inc. All rights reserved.
+// Copyright (C) 2014-2022 Apple Inc. All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
@@ -22,5 +22,8 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
EXECUTABLE_PREFIX = lib;
+INSTALL_PATH = $(WGSL_INSTALL_PATH_PREFIX)/usr/local/lib;
+PRIVATE_HEADERS_FOLDER_PATH = $(WGSL_INSTALL_PATH_PREFIX)/usr/local/include;
+PUBLIC_HEADERS_FOLDER_PATH = $(WGSL_INSTALL_PATH_PREFIX)/usr/local/include;
HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(inherited);
PRODUCT_NAME = wgsl;
diff --git a/Source/WebGPU/Configurations/WGSLUnitTests.xcconfig b/Source/WebGPU/Configurations/WGSLUnitTests.xcconfig
index 0150450..8461259 100644
--- a/Source/WebGPU/Configurations/WGSLUnitTests.xcconfig
+++ b/Source/WebGPU/Configurations/WGSLUnitTests.xcconfig
@@ -21,6 +21,7 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+EXECUTABLE_PREFIX = lib;
HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(inherited);
PRODUCT_NAME = WGSLUnitTests;
ENABLE_TESTABILITY = YES;
