From 4202ec2ab2492d7feace4a7ad8d91a5c12123b99 Mon Sep 17 00:00:00 2001 From: Michael Bikovitsky Date: Sat, 27 Apr 2024 02:29:10 +0300 Subject: [PATCH] Fix CMake builds to export VERILATOR_ROOT (#5063) --- docs/CONTRIBUTORS | 1 + verilator-config.cmake.in | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/CONTRIBUTORS b/docs/CONTRIBUTORS index d5e61832f..3d74a7a08 100644 --- a/docs/CONTRIBUTORS +++ b/docs/CONTRIBUTORS @@ -128,6 +128,7 @@ Marshal Qiao Martin Schmidt Martin Stadler Matthew Ballance +Michael Bikovitsky Michael Killough Michaƫl Lefebvre Michal Czyz diff --git a/verilator-config.cmake.in b/verilator-config.cmake.in index bc61bcccf..9132208f1 100644 --- a/verilator-config.cmake.in +++ b/verilator-config.cmake.in @@ -214,7 +214,9 @@ function(verilate TARGET) file(MAKE_DIRECTORY ${VDIR}) - set(VERILATOR_COMMAND "${VERILATOR_BIN}" --compiler ${COMPILER} + set(VERILATOR_COMMAND "${CMAKE_COMMAND}" -E env "VERILATOR_ROOT=${VERILATOR_ROOT}" + -- + "${VERILATOR_BIN}" --compiler ${COMPILER} --prefix ${VERILATE_PREFIX} --Mdir ${VDIR} --make cmake ${VERILATOR_ARGS} ${VERILATE_VERILATOR_ARGS} ${VERILATE_SOURCES})