[flang-commits] [flang] 55c88aa - [flang][runtime] Added Clang CMake modules include path.

Slava Zakharin via flang-commits flang-commits at lists.llvm.org
Tue Apr 25 09:27:33 PDT 2023


Author: Slava Zakharin
Date: 2023-04-25T09:26:48-07:00
New Revision: 55c88aafa6965646d46404eab16393ba8b1bff95

URL: https://github.com/llvm/llvm-project/commit/55c88aafa6965646d46404eab16393ba8b1bff95
DIFF: https://github.com/llvm/llvm-project/commit/55c88aafa6965646d46404eab16393ba8b1bff95.diff

LOG: [flang][runtime] Added Clang CMake modules include path.

Fortran runtime standalone build is broken after D140998
because of the missing CMake modules path. This is a fix.

Differential Revision: https://reviews.llvm.org/D149090

Added: 
    

Modified: 
    flang/runtime/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/flang/runtime/CMakeLists.txt b/flang/runtime/CMakeLists.txt
index 20e78ff6654af..2a7e74c175533 100644
--- a/flang/runtime/CMakeLists.txt
+++ b/flang/runtime/CMakeLists.txt
@@ -26,6 +26,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
 
   set(LLVM_COMMON_CMAKE_UTILS "${FLANG_SOURCE_DIR}/../cmake")
   set(LLVM_CMAKE_UTILS "${FLANG_SOURCE_DIR}/../llvm/cmake")
+  set(CLANG_CMAKE_UTILS "${FLANG_SOURCE_DIR}/../clang/cmake")
 
   # Add path for custom modules
   list(INSERT CMAKE_MODULE_PATH 0
@@ -35,8 +36,10 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
     "${LLVM_COMMON_CMAKE_UTILS}/Modules"
     "${LLVM_CMAKE_UTILS}"
     "${LLVM_CMAKE_UTILS}/modules"
+    "${CLANG_CMAKE_UTILS}/modules"
     )
 
+  include(AddClang)
   include(AddLLVM)
   include(AddFlang)
   include(HandleLLVMOptions)


        


More information about the flang-commits mailing list