Commit 6ca60caf authored by Patrick Storz's avatar Patrick Storz 🦄

CMake: Fix MSYS2 build

parent d5f097f3
Pipeline #73399877 passed with stages
in 8 minutes and 49 seconds
......@@ -101,12 +101,12 @@ endfunction(list_files_pacman)
function(list_files_pip package_name file_list)
# use pip to show package information including full list of files installed by the package
execute_process(
COMMAND pip show -f ${package_name}
COMMAND pip2 show -f ${package_name}
OUTPUT_FILE list_files_pip_temp.txt
RESULT_VARIABLE res
ERROR_VARIABLE err
)
check_error("${res}" "${err}" "pip show -f ${package_name}")
check_error("${res}" "${err}" "pip2 show -f ${package_name}")
# clean up output
execute_process(
......@@ -118,7 +118,7 @@ function(list_files_pip package_name file_list)
RESULT_VARIABLE res
ERROR_VARIABLE err
)
check_error("${res}" "${err}" "Parsing result of 'pip show -f ${package_name}'")
check_error("${res}" "${err}" "Parsing result of 'pip2 show -f ${package_name}'")
SET(${file_list} ${out} PARENT_SCOPE)
file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/list_files_pip_temp.txt)
......
......@@ -87,10 +87,10 @@ $ARCH-python2-six
for arch in $(eval echo $ARCH); do
case ${arch} in
mingw-w64-i686)
/mingw32/bin/pip install --upgrade coverage pyserial scour
/mingw32/bin/pip2 install --upgrade coverage pyserial scour
;;
mingw-w64-x86_64)
/mingw64/bin/pip install --upgrade coverage pyserial scour
/mingw64/bin/pip2 install --upgrade coverage pyserial scour
;;
esac
done
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment