This is an archive of the discontinued LLVM Phabricator instance.

Differential D139355

[Flang] Restore Flang cmake configuration data
ClosedPublic

Authored by PeteSteinfeld on Dec 5 2022, 11:58 AM.

Details

Reviewers
sscalpone
jeanPerier
thopre
vzakhari
Commits
rGa43319a8ad77: [Flang] Restore Flang cmake configuration data
Summary

Patch D138274 removed some Flang cmake configuration information that we
need for our internal builds. This change restores them.

Diff Detail

Event Timeline

PeteSteinfeld created this revision.Dec 5 2022, 11:58 AM
Herald added a reviewer: sscalpone. · View Herald TranscriptDec 5 2022, 11:58 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald Transcript
PeteSteinfeld requested review of this revision.Dec 5 2022, 11:58 AM
Herald added a subscriber: jdoerfert. · View Herald TranscriptDec 5 2022, 11:58 AM
PeteSteinfeld added reviewers: jeanPerier, thopre.Dec 5 2022, 11:59 AM
vzakhari accepted this revision.Dec 5 2022, 12:01 PM
vzakhari added a subscriber: vzakhari.

LGTM. Thank you!

This revision is now accepted and ready to land.Dec 5 2022, 12:01 PM
This revision was landed with ongoing or failed builds.Dec 5 2022, 12:36 PM
Closed by commit rGa43319a8ad77: [Flang] Restore Flang cmake configuration data (authored by PeteSteinfeld). · Explain Why
This revision was automatically updated to reflect the committed changes.
PeteSteinfeld added a commit: rGa43319a8ad77: [Flang] Restore Flang cmake configuration data.
thopre added a comment.Dec 5 2022, 1:29 PM

Oops sorry, I'm not sure how it happened. I thought I copy/pasted new code only.

Harbormaster completed remote builds in B201177: Diff 480187.Dec 5 2022, 4:33 PM

Revision Contents

PathSize
flang/
cmake/
modules/
4 lines

Diff 480205

flang/cmake/modules/CMakeLists.txt

Show All 22 Lines
set(FLANG_CONFIG_CMAKE_DIR "${flang_cmake_builddir}") set(FLANG_CONFIG_CMAKE_DIR "${flang_cmake_builddir}")
set(FLANG_CONFIG_LLVM_CMAKE_DIR "${llvm_cmake_builddir}") set(FLANG_CONFIG_LLVM_CMAKE_DIR "${llvm_cmake_builddir}")
set(FLANG_CONFIG_INCLUDE_EXPORTS "include(\"${flang_cmake_builddir}/FlangTargets.cmake\")") set(FLANG_CONFIG_INCLUDE_EXPORTS "include(\"${flang_cmake_builddir}/FlangTargets.cmake\")")
set(FLANG_CONFIG_INCLUDE_DIRS set(FLANG_CONFIG_INCLUDE_DIRS
"${FLANG_SOURCE_DIR}/include" "${FLANG_SOURCE_DIR}/include"
"${FLANG_BINARY_DIR}/include" "${FLANG_BINARY_DIR}/include"
) )
configure_file( configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/FlangConfig.cmake.in
${flang_cmake_builddir}/FlangConfig.cmake
@ONLY)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/FlangConfigVersion.cmake.in ${CMAKE_CURRENT_SOURCE_DIR}/FlangConfigVersion.cmake.in
${flang_cmake_builddir}/FlangConfigVersion.cmake ${flang_cmake_builddir}/FlangConfigVersion.cmake
@ONLY) @ONLY)
set(FLANG_CONFIG_CMAKE_DIR) set(FLANG_CONFIG_CMAKE_DIR)
set(FLANG_CONFIG_LLVM_CMAKE_DIR) set(FLANG_CONFIG_LLVM_CMAKE_DIR)
# Generate FlangConfig.cmake for the install tree. # Generate FlangConfig.cmake for the install tree.
find_prefix_from_config(FLANG_CONFIG_CODE FLANG_INSTALL_PREFIX "${FLANG_INSTALL_PACKAGE_DIR}") find_prefix_from_config(FLANG_CONFIG_CODE FLANG_INSTALL_PREFIX "${FLANG_INSTALL_PACKAGE_DIR}")
Show All 35 Lines