From e9395babbd62a6cc5e0406d09178053ab2aa278a Mon Sep 17 00:00:00 2001 From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com> Date: Wed, 6 Jul 2022 21:52:16 -0400 Subject: [PATCH] ensure an empty llvm-dev dep doesn't make its way to mandel-dev .deb --- package.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.cmake b/package.cmake index 3d99890405..f2d3149645 100644 --- a/package.cmake +++ b/package.cmake @@ -49,9 +49,9 @@ string(REGEX REPLACE "^(${CMAKE_PROJECT_NAME})" "\\1-dev" CPACK_DEBIAN_DEV_FILE_ #deb package tooling will be unable to detect deps for the dev package. llvm is tricky since we don't know what package could have been used; try to figure it out set(CPACK_DEBIAN_DEV_PACKAGE_DEPENDS "libboost-all-dev;libssl-dev;libgmp-dev") find_program(DPKG_QUERY "dpkg-query") -if(DPKG_QUERY AND OS_RELEASE MATCHES "\n?ID=\"?ubuntu") +if(DPKG_QUERY AND OS_RELEASE MATCHES "\n?ID=\"?ubuntu" AND LLVM_CMAKE_DIR) execute_process(COMMAND "${DPKG_QUERY}" -S "${LLVM_CMAKE_DIR}" COMMAND cut -d: -f1 RESULT_VARIABLE LLVM_PKG_FIND_RESULT OUTPUT_VARIABLE LLVM_PKG_FIND_OUTPUT) - if(LLVM_PKG_FIND_RESULT EQUAL 0) + if(LLVM_PKG_FIND_OUTPUT) string(STRIP "${LLVM_PKG_FIND_OUTPUT}" LLVM_PKG_FIND_OUTPUT) list(APPEND CPACK_DEBIAN_DEV_PACKAGE_DEPENDS "${LLVM_PKG_FIND_OUTPUT}") endif()