This is an archive of the discontinued LLVM Phabricator instance.

Differential D109352

[OpenMP] [OMPD] OPENMP_INSTALL_LIBDIR is set for the install dir
ClosedPublic

Authored by Vigneshbalu on Sep 7 2021, 4:04 AM.

Details

Reviewers
mceier
jdoerfert
Commits
rG939154125b33: [OpenMP] [OMPD] OPENMP_INSTALL_LIBDIR is set for the install dir
Summary

OPENMP_INSTALL_LIBDIR is set to the installation path of shared and static libompd.

This should avoid the mixing of 32 and 64 bit on same path in multi-lib set-up.

Diff Detail

Event Timeline

Vigneshbalu created this revision.Sep 7 2021, 4:04 AM
Herald added subscribers: guansong, yaxunl, mgorny. · View Herald TranscriptSep 7 2021, 4:04 AM
Vigneshbalu requested review of this revision.Sep 7 2021, 4:04 AM
Herald added a reviewer: jdoerfert. · View Herald TranscriptSep 7 2021, 4:04 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: openmp-commits, sstefan1. · View Herald Transcript
Harbormaster completed remote builds in B122845: Diff 371031.Sep 7 2021, 4:38 AM
mceier accepted this revision.Sep 7 2021, 6:50 AM

I confirm this patch fixes the multilib issue on my system.

This revision is now accepted and ready to land.Sep 7 2021, 6:50 AM
Closed by commit rG939154125b33: [OpenMP] [OMPD] OPENMP_INSTALL_LIBDIR is set for the install dir (authored by Vignesh Balasubramanian <Vignesh.Balasubrmanian@amd.com>). · Explain WhySep 12 2021, 9:56 PM
This revision was automatically updated to reflect the committed changes.
Vignesh Balasubramanian <Vignesh.Balasubrmanian@amd.com> added a commit: rG939154125b33: [OpenMP] [OMPD] OPENMP_INSTALL_LIBDIR is set for the install dir.

Revision Contents

PathSize
openmp/
libompd/
src/
4 lines

Diff 372160

openmp/libompd/src/CMakeLists.txt

Show All 39 Lines
include_directories ( include_directories (
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${LIBOMP_INCLUDE_DIR} ${LIBOMP_INCLUDE_DIR}
${LIBOMP_SRC_DIR} ${LIBOMP_SRC_DIR}
) )
INSTALL( TARGETS ompd INSTALL( TARGETS ompd
LIBRARY DESTINATION lib LIBRARY DESTINATION ${OPENMP_INSTALL_LIBDIR}
ARCHIVE DESTINATION lib/static ARCHIVE DESTINATION ${OPENMP_INSTALL_LIBDIR}
RUNTIME DESTINATION bin ) RUNTIME DESTINATION bin )