Skip to content

Commit

Permalink
non capturing output
Browse files Browse the repository at this point in the history
  • Loading branch information
memsharded committed May 4, 2019
1 parent 9f5421c commit 857403c
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions conan.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -384,17 +384,17 @@ function(conan_cmake_install)
message(STATUS "Conan executing: ${conan_command} ${_conan_args}")

if(ARGUMENTS_OUTPUT_QUIET)
set(OUTPUT_CONTROL OUTPUT_QUIET)
execute_process(COMMAND ${conan_command} ${conan_args}
RESULT_VARIABLE return_code
OUTPUT_VARIABLE conan_output
ERROR_VARIABLE conan_output
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
else()
execute_process(COMMAND ${conan_command} ${conan_args}
RESULT_VARIABLE return_code
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
endif()

execute_process(COMMAND ${conan_command} ${conan_args}
RESULT_VARIABLE return_code
OUTPUT_VARIABLE conan_output
ERROR_VARIABLE conan_output
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

message(STATUS "${conan_output}")

if(NOT "${return_code}" STREQUAL "0")
message(FATAL_ERROR "Conan install failed='${return_code}'")
endif()
Expand Down

0 comments on commit 857403c

Please sign in to comment.