From 7b570feed42976a6e787d79a70aaf8e667745e58 Mon Sep 17 00:00:00 2001
From: Ellie Hermaszewska <ellieh@nvidia.com>
Date: Thu, 14 Nov 2024 12:34:18 +0800
Subject: Correct include dir for libslang (#5539)

This stops adding the repo root to the include path for anything linking
with slang. This enabled a bunch of convenient includes, but might lead
to confusing behavior for anyone including slang. Not to mention
differences including it from an install vs source.

Co-authored-by: Yong He <yonghe@outlook.com>
---
 source/slang-llvm/slang-llvm-filecheck.cpp | 2 +-
 source/slang/CMakeLists.txt                | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'source')

diff --git a/source/slang-llvm/slang-llvm-filecheck.cpp b/source/slang-llvm/slang-llvm-filecheck.cpp
index c319a61c9..492b0e0d4 100644
--- a/source/slang-llvm/slang-llvm-filecheck.cpp
+++ b/source/slang-llvm/slang-llvm-filecheck.cpp
@@ -9,7 +9,7 @@
 #include <llvm/ADT/SmallString.h>
 #include <llvm/FileCheck/FileCheck.h>
 #include <llvm/Support/raw_ostream.h>
-#include <tools/slang-test/filecheck.h>
+#include <slang-test/filecheck.h>
 
 namespace slang_llvm
 {
diff --git a/source/slang/CMakeLists.txt b/source/slang/CMakeLists.txt
index 278456dbb..0adaa04a7 100644
--- a/source/slang/CMakeLists.txt
+++ b/source/slang/CMakeLists.txt
@@ -224,12 +224,7 @@ set(slang_link_args
     slang-lookup-tables
     SPIRV-Headers
 )
-set(slang_interface_args
-    # slang.h is in the project root, so include that directory in the interface
-    # for slang
-    INCLUDE_DIRECTORIES_PUBLIC
-    ${slang_SOURCE_DIR}
-)
+set(slang_interface_args INCLUDE_DIRECTORIES_PUBLIC ${slang_SOURCE_DIR}/include)
 set(slang_public_lib_args
     PUBLIC_HEADERS
     ${slang_SOURCE_DIR}/include/slang*.h
-- 
cgit v1.2.3