[PATCH] D141521: [llvm/cmake] Replace CMAKE_SOURCE_DIR with PROJECT_SOURCE_DIR

[Sebastian Neubauer via Phabricator via llvm-commits]

sebastian-ne created this revision.
sebastian-ne added reviewers: dstuttard, jsilvanus.
Herald added subscribers: pmatos, asb, pengfei, s.egerton, simoncook, jgravelle-google, sbc100, nemanjai, dschuff.
Herald added a project: All.
sebastian-ne requested review of this revision.
Herald added subscribers: llvm-commits, pcwang-thead, aheejin.
Herald added a project: LLVM.

When adding llvm to a build with add_subdirectory, CMAKE_SOURCE_DIR
refers to the source directory of the parent project. We want to use
PROJECT_SOURCE_DIR instead.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D141521

Files:
  llvm/cmake/modules/HandleLLVMOptions.cmake
  llvm/include/llvm/TargetParser/CMakeLists.txt
  llvm/unittests/Target/PowerPC/CMakeLists.txt
  llvm/unittests/Target/WebAssembly/CMakeLists.txt
  llvm/unittests/Target/X86/CMakeLists.txt


Index: llvm/unittests/Target/X86/CMakeLists.txt
===================================================================
--- llvm/unittests/Target/X86/CMakeLists.txt
+++ llvm/unittests/Target/X86/CMakeLists.txt
@@ -1,6 +1,6 @@
 include_directories(
-  ${CMAKE_SOURCE_DIR}/lib/Target/X86
-  ${CMAKE_BINARY_DIR}/lib/Target/X86
+  ${PROJECT_SOURCE_DIR}/lib/Target/X86
+  ${PROJECT_BINARY_DIR}/lib/Target/X86
   )
 
 set(LLVM_LINK_COMPONENTS
Index: llvm/unittests/Target/WebAssembly/CMakeLists.txt
===================================================================
--- llvm/unittests/Target/WebAssembly/CMakeLists.txt
+++ llvm/unittests/Target/WebAssembly/CMakeLists.txt
@@ -1,6 +1,6 @@
 include_directories(
-  ${CMAKE_SOURCE_DIR}/lib/Target/WebAssembly
-  ${CMAKE_BINARY_DIR}/lib/Target/WebAssembly
+  ${PROJECT_SOURCE_DIR}/lib/Target/WebAssembly
+  ${PROJECT_BINARY_DIR}/lib/Target/WebAssembly
   )
 
 set(LLVM_LINK_COMPONENTS
Index: llvm/unittests/Target/PowerPC/CMakeLists.txt
===================================================================
--- llvm/unittests/Target/PowerPC/CMakeLists.txt
+++ llvm/unittests/Target/PowerPC/CMakeLists.txt
@@ -1,6 +1,6 @@
 include_directories(
-  ${CMAKE_SOURCE_DIR}/lib/Target/PowerPC
-  ${CMAKE_BINARY_DIR}/lib/Target/PowerPC
+  ${PROJECT_SOURCE_DIR}/lib/Target/PowerPC
+  ${PROJECT_BINARY_DIR}/lib/Target/PowerPC
   )
 
 set(LLVM_LINK_COMPONENTS
Index: llvm/include/llvm/TargetParser/CMakeLists.txt
===================================================================
--- llvm/include/llvm/TargetParser/CMakeLists.txt
+++ llvm/include/llvm/TargetParser/CMakeLists.txt
@@ -1,4 +1,3 @@
-set(LLVM_TARGET_DEFINITIONS ${CMAKE_SOURCE_DIR}/lib/Target/RISCV/RISCV.td)
-tablegen(LLVM RISCVTargetParserDef.inc -gen-riscv-target-def -I ${CMAKE_SOURCE_DIR}/lib/Target/RISCV/)
+set(LLVM_TARGET_DEFINITIONS ${PROJECT_SOURCE_DIR}/lib/Target/RISCV/RISCV.td)
+tablegen(LLVM RISCVTargetParserDef.inc -gen-riscv-target-def -I ${PROJECT_SOURCE_DIR}/lib/Target/RISCV/)
 add_public_tablegen_target(RISCVTargetParserTableGen)
-
Index: llvm/cmake/modules/HandleLLVMOptions.cmake
===================================================================
--- llvm/cmake/modules/HandleLLVMOptions.cmake
+++ llvm/cmake/modules/HandleLLVMOptions.cmake
@@ -938,7 +938,7 @@
     append("-fsanitize=fuzzer-no-link" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
   endif()
   if (LLVM_USE_SANITIZER MATCHES ".*Undefined.*")
-    set(IGNORELIST_FILE "${CMAKE_SOURCE_DIR}/utils/sanitizers/ubsan_ignorelist.txt")
+    set(IGNORELIST_FILE "${PROJECT_SOURCE_DIR}/utils/sanitizers/ubsan_ignorelist.txt")
     if (EXISTS "${IGNORELIST_FILE}")
       # Use this option name version since -fsanitize-ignorelist is only
       # accepted with clang 13.0 or newer.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D141521.488270.patch
Type: text/x-patch
Size: 2736 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230111/9e14ce3f/attachment.bin>