forked from lthn/blockchain
Merge remote-tracking branch 'origin/dev-build' into dev-build
This commit is contained in:
commit
e0dee18c86
1 changed files with 3 additions and 3 deletions
|
|
@ -81,7 +81,7 @@ if(NOT EXISTS "${CONAN_EXECUTABLE}")
|
|||
RESULT_VARIABLE result
|
||||
)
|
||||
elseif(CONAN_ARCHIVE_TYPE STREQUAL "zip")
|
||||
# Cmake -E tar can handle zip files
|
||||
# CMake -E tar can handle zip files
|
||||
execute_process(
|
||||
COMMAND ${CMAKE_COMMAND} -E tar xf "${CONAN_ARCHIVE}"
|
||||
WORKING_DIRECTORY "${CONAN_INSTALL_DIR}"
|
||||
|
|
@ -96,7 +96,7 @@ if(NOT EXISTS "${CONAN_EXECUTABLE}")
|
|||
# Clean up the archive
|
||||
file(REMOVE "${CONAN_ARCHIVE}")
|
||||
|
||||
message(STATUS "Conan installed successfully in ${CONAN_INSTALL_DIR}/conan")
|
||||
message(STATUS "Conan installed successfully at ${CONAN_EXECUTABLE}")
|
||||
else()
|
||||
message(STATUS "Conan already installed in ${CONAN_INSTALL_DIR}/conan")
|
||||
message(STATUS "Conan already installed at ${CONAN_EXECUTABLE}")
|
||||
endif()
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue