Undo unwanted changes
This commit is contained in:
parent
8af7b2a910
commit
81f4bf65ee
|
@ -1,3 +1,7 @@
|
||||||
|
# Taken from https://github.com/conan-io/cmake-conan/blob/v0.15/conan.cmake
|
||||||
|
# Changes:
|
||||||
|
# - Add a "Please install conan" sentence to the error message when conan wasn't found.
|
||||||
|
|
||||||
# The MIT License (MIT)
|
# The MIT License (MIT)
|
||||||
|
|
||||||
# Copyright (c) 2018 JFrog
|
# Copyright (c) 2018 JFrog
|
||||||
|
@ -528,7 +532,7 @@ macro(conan_check)
|
||||||
|
|
||||||
find_program(CONAN_CMD conan)
|
find_program(CONAN_CMD conan)
|
||||||
if(NOT CONAN_CMD AND CONAN_REQUIRED)
|
if(NOT CONAN_CMD AND CONAN_REQUIRED)
|
||||||
message(FATAL_ERROR "Conan executable not found!")
|
message(FATAL_ERROR "Conan executable not found! Please install conan.")
|
||||||
endif()
|
endif()
|
||||||
message(STATUS "Conan: Found program ${CONAN_CMD}")
|
message(STATUS "Conan: Found program ${CONAN_CMD}")
|
||||||
execute_process(COMMAND ${CONAN_CMD} --version
|
execute_process(COMMAND ${CONAN_CMD} --version
|
||||||
|
|
Loading…
Reference in New Issue