From 1e7ef8b04132972c2a50cc96230ba1813fb0d061 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Wed, 7 Jun 2023 21:13:03 +0300 Subject: [PATCH] Hide JSON output from 'conan install' --- cmake/conan.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake/conan.cmake b/cmake/conan.cmake index 8fcf3825..fffab518 100644 --- a/cmake/conan.cmake +++ b/cmake/conan.cmake @@ -505,7 +505,7 @@ function(conan_cmake_install) ${OUTPUT_FOLDER} ${GENERATOR} ${BUILD} ${OPTIONS} ${OPTIONS_HOST} ${OPTIONS_BUILD} ${PROFILE} ${PROFILE_HOST} ${PROFILE_BUILD} ${SETTINGS} ${SETTINGS_HOST} ${SETTINGS_BUILD} - ${CONF_HOST} ${CONF_BUILD} --format=json) + ${CONF_HOST} ${CONF_BUILD}) string(REPLACE ";" " " _install_args "${install_args}") message(STATUS "Conan executing: ${CONAN_CMD} ${_install_args}") @@ -536,7 +536,11 @@ function(conan_cmake_install) message(FATAL_ERROR "Conan install failed='${return_code}'") endif() else() - string(REGEX MATCH "\"generators_folder\": *\"([^\"]*)\"" MATCHED_PATH "${conan_stdout}") + execute_process(COMMAND ${CONAN_CMD} ${install_args};--format=json + OUTPUT_VARIABLE conan_json_info + ERROR_QUIET + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + string(REGEX MATCH "\"generators_folder\": *\"([^\"]*)\"" MATCHED_PATH "${conan_json_info}") string(REGEX REPLACE "\"generators_folder\": *\"([^\"]*)\"" "\\1" CONAN_GENERATORS_FOLDER "${MATCHED_PATH}") set(CONAN_GENERATORS_FOLDER "${CONAN_GENERATORS_FOLDER}" PARENT_SCOPE) endif()