This is an archive of the discontinued LLVM Phabricator instance.

Differential D132314

[Polly] Don't use `llvm-config` anymore (in CMake sad path)
ClosedPublic

Authored by Ericson2314 on Aug 20 2022, 2:41 PM.

Details

Reviewers
phosek
mgorny
tstellar
bollu
sebastian-ne
beanz
Commits
rG4c5114250bb7: [Polly] Don't use `llvm-config` anymore (in CMake sad path)
Summary

If LLVM_BUILD_MAIN_SRC_DIR is not defined, just assume we are in
regular monorepo layout. Non-standard (and not really supported) layouts
can still be configured manually.

Diff Detail

Event Timeline

Ericson2314 created this revision.Aug 20 2022, 2:41 PM
Herald added a reviewer: bollu. · View Herald TranscriptAug 20 2022, 2:41 PM
Herald added a project: Restricted Project. · View Herald Transcript
Ericson2314 requested review of this revision.Aug 20 2022, 2:41 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 20 2022, 2:41 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B182411: Diff 454254.Aug 20 2022, 3:02 PM
Ericson2314 added reviewers: sebastian-ne, beanz.Aug 23 2022, 3:16 PM
beanz accepted this revision.Aug 23 2022, 7:29 PM

LGTM

This revision is now accepted and ready to land.Aug 23 2022, 7:29 PM
Closed by commit rG4c5114250bb7: [Polly] Don't use `llvm-config` anymore (in CMake sad path) (authored by Ericson2314). · Explain WhyAug 23 2022, 7:47 PM
This revision was automatically updated to reflect the committed changes.
Ericson2314 added a commit: rG4c5114250bb7: [Polly] Don't use `llvm-config` anymore (in CMake sad path).

Revision Contents

PathSize
polly/
9 lines

Diff 455052

polly/CMakeLists.txt

Show All 14 Linesif(POLLY_STANDALONE_BUILD)
include(HandleLLVMOptions) include(HandleLLVMOptions)
include(AddLLVM) include(AddLLVM)
# Add the llvm header path. # Add the llvm header path.
include_directories(${LLVM_INCLUDE_DIRS}) include_directories(${LLVM_INCLUDE_DIRS})
# Sources available, too? # Sources available, too?
if (LLVM_BUILD_MAIN_SRC_DIR) if (LLVM_BUILD_MAIN_SRC_DIR)
set(LLVM_SOURCE_ROOT ${LLVM_BUILD_MAIN_SRC_DIR} CACHE PATH set(default_llvm_src "${LLVM_BUILD_MAIN_SRC_DIR}")
"Path to LLVM source tree")
else() else()
execute_process(COMMAND "${LLVM_TOOLS_BINARY_DIR}/llvm-config" --src-root set(default_llvm_src "${CMAKE_CURRENT_SOURCE_DIR}/../llvm")
OUTPUT_VARIABLE MAIN_SRC_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE)
set(LLVM_SOURCE_ROOT ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree")
endif() endif()
set(LLVM_SOURCE_ROOT ${default_llvm_src} CACHE PATH "Path to LLVM source tree")
# Enable unit tests if available. # Enable unit tests if available.
set(POLLY_GTEST_AVAIL 0) set(POLLY_GTEST_AVAIL 0)
set(UNITTEST_DIR ${LLVM_SOURCE_ROOT}/utils/unittest) set(UNITTEST_DIR ${LLVM_SOURCE_ROOT}/utils/unittest)
if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h) if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h)
if (NOT TARGET gtest) if (NOT TARGET gtest)
add_subdirectory(${UNITTEST_DIR} utils/unittest) add_subdirectory(${UNITTEST_DIR} utils/unittest)
endif() endif()
▲ Show 20 Lines • Show All 155 Lines • Show Last 20 Lines