Skip to content

Commit

Permalink
Hide JSON output from 'conan install'
Browse files Browse the repository at this point in the history
  • Loading branch information
valgur committed Jun 7, 2023
1 parent e0cb72b commit 1e7ef8b
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions cmake/conan.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down Expand Up @@ -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()
Expand Down

0 comments on commit 1e7ef8b

Please sign in to comment.