This is an archive of the discontinued LLVM Phabricator instance.

Differential D149090

[flang][runtime] Added Clang CMake modules include path.
ClosedPublic

Authored by vzakhari on Apr 24 2023, 12:47 PM.

Details

Reviewers
Da-Viper
klausler
awarzynski
sscalpone
Commits
rG55c88aafa696: [flang][runtime] Added Clang CMake modules include path.
Summary

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

Diff Detail

Event Timeline

vzakhari created this revision.Apr 24 2023, 12:47 PM
Herald added a reviewer: sscalpone. · View Herald TranscriptApr 24 2023, 12:47 PM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: sunshaoce, jdoerfert. · View Herald Transcript
vzakhari requested review of this revision.Apr 24 2023, 12:47 PM
awarzynski accepted this revision.Apr 24 2023, 1:12 PM

Sorry about this and thanks for the fix, makes sense! LGTM

This revision is now accepted and ready to land.Apr 24 2023, 1:12 PM
vzakhari added a comment.Apr 24 2023, 1:14 PM
In D149090#4293540, @awarzynski wrote:

Sorry about this and thanks for the fix, makes sense! LGTM

No problem. Thank you for the review!

Harbormaster completed remote builds in B227802: Diff 516507.Apr 24 2023, 8:47 PM
This revision was landed with ongoing or failed builds.Apr 25 2023, 9:27 AM
Closed by commit rG55c88aafa696: [flang][runtime] Added Clang CMake modules include path. (authored by vzakhari). · Explain Why
This revision was automatically updated to reflect the committed changes.
vzakhari added a commit: rG55c88aafa696: [flang][runtime] Added Clang CMake modules include path..
jpenix-quic mentioned this in D149277: [flang] Add Clang CMake modules path for Decimal library.Apr 26 2023, 11:26 AM
jpenix-quic mentioned this in rG524ceecd89bb: [flang] Add Clang CMake modules path for Decimal library.Apr 27 2023, 11:06 AM

Revision Contents

PathSize
flang/
runtime/
3 lines

Diff 516507

flang/runtime/CMakeLists.txt

Show All 20 Linesif (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED TRUE) set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
set(FLANG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/..") set(FLANG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/..")
set(LLVM_COMMON_CMAKE_UTILS "${FLANG_SOURCE_DIR}/../cmake") set(LLVM_COMMON_CMAKE_UTILS "${FLANG_SOURCE_DIR}/../cmake")
set(LLVM_CMAKE_UTILS "${FLANG_SOURCE_DIR}/../llvm/cmake") set(LLVM_CMAKE_UTILS "${FLANG_SOURCE_DIR}/../llvm/cmake")
set(CLANG_CMAKE_UTILS "${FLANG_SOURCE_DIR}/../clang/cmake")
# Add path for custom modules # Add path for custom modules
list(INSERT CMAKE_MODULE_PATH 0 list(INSERT CMAKE_MODULE_PATH 0
"${FLANG_SOURCE_DIR}/cmake" "${FLANG_SOURCE_DIR}/cmake"
"${FLANG_SOURCE_DIR}/cmake/modules" "${FLANG_SOURCE_DIR}/cmake/modules"
"${LLVM_COMMON_CMAKE_UTILS}" "${LLVM_COMMON_CMAKE_UTILS}"
"${LLVM_COMMON_CMAKE_UTILS}/Modules" "${LLVM_COMMON_CMAKE_UTILS}/Modules"
"${LLVM_CMAKE_UTILS}" "${LLVM_CMAKE_UTILS}"
"${LLVM_CMAKE_UTILS}/modules" "${LLVM_CMAKE_UTILS}/modules"
"${CLANG_CMAKE_UTILS}/modules"
) )
include(AddClang)
include(AddLLVM) include(AddLLVM)
include(AddFlang) include(AddFlang)
include(HandleLLVMOptions) include(HandleLLVMOptions)
include(TestBigEndian) include(TestBigEndian)
test_big_endian(IS_BIGENDIAN) test_big_endian(IS_BIGENDIAN)
if (IS_BIGENDIAN) if (IS_BIGENDIAN)
add_compile_definitions(FLANG_BIG_ENDIAN=1) add_compile_definitions(FLANG_BIG_ENDIAN=1)
▲ Show 20 Lines • Show All 111 Lines • Show Last 20 Lines