This is an archive of the discontinued LLVM Phabricator instance.

Differential D121012

[BOLT][CMAKE] Remove CMake 3.13.4 incompatible parameter
ClosedPublic

Authored by Amir on Mar 4 2022, 10:17 AM.

Details

Reviewers
rafauler
maksfb
Commits
rG018ad03efae2: [BOLT][CMAKE] Remove CMake 3.13.4 incompatible parameter
Summary

Remove TYPE BIN parameter that is introduced in CMake 3.14 and revert back to
the equivalent compatible form DESTINATION ${CMAKE_INSTALL_BINDIR}.

Addresses https://github.com/llvm/llvm-project/issues/54099

Diff Detail

Event Timeline

Amir created this revision.Mar 4 2022, 10:17 AM
Herald added a reviewer: rafauler. · View Herald TranscriptMar 4 2022, 10:17 AM
Herald added a reviewer: maksfb. · View Herald Transcript
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: ayermolo, mgorny. · View Herald Transcript
Amir requested review of this revision.Mar 4 2022, 10:17 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 4 2022, 10:17 AM
Herald added subscribers: llvm-commits, yota9. · View Herald Transcript
Harbormaster completed remote builds in B152626: Diff 413061.Mar 4 2022, 10:25 AM
Amir mentioned this in D120625: [BOLT][CMAKE] Bump minimum required CMake version to 3.14.Mar 4 2022, 11:26 AM
Amir added subscribers: nikic, tstellar.Mar 7 2022, 11:08 AM

@rafauler
Can you please review this change?

@tstellar
Would it be OK to backport it to release/14.x to avoid conflicting CMake requirements? (request from @nikic, see linked gh issue)

rafauler accepted this revision.Mar 7 2022, 5:16 PM

LGTM

This revision is now accepted and ready to land.Mar 7 2022, 5:16 PM
Closed by commit rG018ad03efae2: [BOLT][CMAKE] Remove CMake 3.13.4 incompatible parameter (authored by Amir). · Explain WhyMar 7 2022, 6:42 PM
This revision was automatically updated to reflect the committed changes.
Amir added a commit: rG018ad03efae2: [BOLT][CMAKE] Remove CMake 3.13.4 incompatible parameter.
Amir added a comment.EditedMar 7 2022, 6:49 PM

Sorry, couldn't wait till tomorrow as the final release candidate is planned for Tuesday March 8th.
Pushed to release/14.x as bfaed485756a

Revision Contents

PathSize
bolt/
tools/
driver/
2 lines

Diff 413677

bolt/tools/driver/CMakeLists.txt

Show All 29 Linesset(BOLT_DEPENDS
llvm-boltdiff llvm-boltdiff
) )
add_custom_target(bolt DEPENDS ${BOLT_DEPENDS}) add_custom_target(bolt DEPENDS ${BOLT_DEPENDS})
install(PROGRAMS install(PROGRAMS
${CMAKE_BINARY_DIR}/bin/llvm-bolt ${CMAKE_BINARY_DIR}/bin/llvm-bolt
${CMAKE_BINARY_DIR}/bin/perf2bolt ${CMAKE_BINARY_DIR}/bin/perf2bolt
${CMAKE_BINARY_DIR}/bin/llvm-boltdiff ${CMAKE_BINARY_DIR}/bin/llvm-boltdiff
TYPE BIN DESTINATION ${CMAKE_INSTALL_BINDIR}
COMPONENT bolt COMPONENT bolt
) )
add_llvm_install_targets(install-bolt DEPENDS bolt COMPONENT bolt) add_llvm_install_targets(install-bolt DEPENDS bolt COMPONENT bolt)
set_target_properties(bolt PROPERTIES FOLDER "BOLT") set_target_properties(bolt PROPERTIES FOLDER "BOLT")
set_target_properties(install-bolt PROPERTIES FOLDER "BOLT") set_target_properties(install-bolt PROPERTIES FOLDER "BOLT")
include_directories( ${BOLT_SOURCE_DIR}/lib ) include_directories( ${BOLT_SOURCE_DIR}/lib )