Skip to content

[opt-viewer] Allow users to set LLVM_HAVE_OPT_VIEWER_MODULES manually… #151845

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kraj wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[opt-viewer] Allow users to set LLVM_HAVE_OPT_VIEWER_MODULES manually… #151845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions llvm/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake
NO_POLICY_SCOPE)

option(LLVM_HAVE_OPT_VIEWER_MODULES "Enable opt-viewer modules support" ON)

# Builds with custom install names and installation rpath setups may not work
# in the build tree. Allow these cases to use CMake's default build tree
# behavior by setting `LLVM_NO_INSTALL_NAME_DIR_FOR_BUILD_TREE` to do this.
Expand Down
13 changes: 10 additions & 3 deletions llvm/cmake/config-ix.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,10 +805,17 @@ foreach(module ${PYTHON_MODULES})
find_python_module(${module})
endforeach()

if(PY_PYGMENTS_FOUND AND PY_PYGMENTS_LEXERS_C_CPP_FOUND AND PY_YAML_FOUND)
set (LLVM_HAVE_OPT_VIEWER_MODULES 1)
if(NOT DEFINED LLVM_HAVE_OPT_VIEWER_MODULES)
if(PY_PYGMENTS_FOUND AND PY_PYGMENTS_LEXERS_C_CPP_FOUND AND PY_YAML_FOUND)
set (LLVM_HAVE_OPT_VIEWER_MODULES 1)
else()
set (LLVM_HAVE_OPT_VIEWER_MODULES 0)
endif()
elseif(LLVM_HAVE_OPT_VIEWER_MODULES)
# Use the user-provided value
set(LLVM_HAVE_OPT_VIEWER_MODULES 1)
else()
set (LLVM_HAVE_OPT_VIEWER_MODULES 0)
set(LLVM_HAVE_OPT_VIEWER_MODULES 0)
endif()

function(llvm_get_host_prefixes_and_suffixes)
Expand Down
24 changes: 13 additions & 11 deletions llvm/tools/opt-viewer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,18 @@ set (files
"optrecord.py"
"style.css")

foreach (file ${files})
install(PROGRAMS ${file}
DESTINATION "${CMAKE_INSTALL_DATADIR}/opt-viewer"
COMPONENT opt-viewer)
endforeach (file)
if(LLVM_HAVE_OPT_VIEWER_MODULES)
foreach (file ${files})
install(PROGRAMS ${file}
DESTINATION "${CMAKE_INSTALL_DATADIR}/opt-viewer"
COMPONENT opt-viewer)
endforeach (file)

add_custom_target(opt-viewer DEPENDS ${files})
set_target_properties(opt-viewer PROPERTIES FOLDER "LLVM/Tools")
if(NOT LLVM_ENABLE_IDE)
add_llvm_install_targets("install-opt-viewer"
DEPENDS opt-viewer
COMPONENT opt-viewer)
add_custom_target(opt-viewer DEPENDS ${files})
set_target_properties(opt-viewer PROPERTIES FOLDER "LLVM/Tools")
if(NOT LLVM_ENABLE_IDE)
add_llvm_install_targets("install-opt-viewer"
DEPENDS opt-viewer
COMPONENT opt-viewer)
endif()
endif()
Loading