From d48eef07d14ac6802a004240ec26f4b8a44f52dc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 2 Aug 2025 13:55:11 -0700 Subject: [PATCH] llvm: Allow users to set LLVM_HAVE_OPT_VIEWER_MODULES manually from the CMake Check right before setting LLVM_HAVE_OPT_VIEWER_MODULES so that if the user specifies the variable on the commandline it takes precedence. If not, fall back to the old logic Upstream-Status: Pending Signed-off-by: Khem Raj --- llvm/cmake/config-ix.cmake | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake index a8e4e5a63244..14fd56554dd6 100644 --- a/llvm/cmake/config-ix.cmake +++ b/llvm/cmake/config-ix.cmake @@ -805,11 +805,14 @@ 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((LLVM_HAVE_OPT_VIEWER_MODULES STREQUAL "0") OR (LLVM_HAVE_OPT_VIEWER_MODULES STREQUAL "1")) + set(_LLVM_HAVE_OPT_VIEWER_MODULES "${LLVM_HAVE_OPT_VIEWER_MODULES}") +elseif(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) + set(_LLVM_HAVE_OPT_VIEWER_MODULES 0) endif() +set(LLVM_HAVE_OPT_VIEWER_MODULES ${_LLVM_HAVE_OPT_VIEWER_MODULES} CACHE INTERNAL "" FORCE) function(llvm_get_host_prefixes_and_suffixes) # Not all platform files will set these variables (relying on them being