Skip to content

Commit 311283b

Browse files
committed
dialogflow_task_executive/gdrive_ros: use --cert for catkin_virtualenv for indigo
1 parent 9bf8b50 commit 311283b

File tree

5 files changed

+38
-2
lines changed

5 files changed

+38
-2
lines changed

dialogflow_task_executive/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,10 @@ elseif("$ENV{ROS_DISTRO}" STREQUAL "indigo")
5555
COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/requirements.txt.indigo ${CMAKE_CURRENT_SOURCE_DIR}/requirements.txt
5656
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
5757
)
58-
catkin_generate_virtualenv(PYTHON_INTERPRETER python2)
58+
file(DOWNLOAD http://curl.haxx.se/ca/cacert.pem ${CMAKE_BINARY_DIR}/cacert.pem)
59+
catkin_generate_virtualenv(PYTHON_INTERPRETER python2
60+
# https://stackoverflow.com/questions/25981703/pip-install-fails-with-connection-error-ssl-certificate-verify-failed
61+
EXTRA_PIP_ARGS -vvv --cert=${CMAKE_BINARY_DIR}/cacert.pem)
5962
elseif("$ENV{ROS_DISTRO}" STRGREATER "melodic")
6063
catkin_generate_virtualenv(
6164
INPUT_REQUIREMENTS requirements.in.noetic

gdrive_ros/CMakeLists.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,20 @@ catkin_package(
2323
message_runtime
2424
)
2525

26+
if("$ENV{ROS_DISTRO}" STREQUAL "indigo")
27+
file(DOWNLOAD http://curl.haxx.se/ca/cacert.pem ${CMAKE_BINARY_DIR}/cacert.pem)
2628
catkin_generate_virtualenv(
2729
PYTHON_INTERPRETER python3
2830
CHECK_VENV FALSE
31+
# https://stackoverflow.com/questions/25981703/pip-install-fails-with-connection-error-ssl-certificate-verify-failed
32+
EXTRA_PIP_ARGS -vvv --cert=${CMAKE_BINARY_DIR}/cacert.pem
2933
)
34+
else()
35+
catkin_generate_virtualenv(
36+
PYTHON_INTERPRETER python3
37+
CHECK_VENV FALSE
38+
)
39+
endif()
3040

3141

3242
catkin_install_python(PROGRAMS node_scripts/gdrive_server_node.py node_scripts/sample_gdrive_rospy_client.py

respeaker_ros/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ if($ENV{ROS_DISTRO} STRGREATER "melodic")
1919
PYTHON_INTERPRETER python3
2020
CHECK_VENV FALSE
2121
)
22+
elseif("$ENV{ROS_DISTRO}" STREQUAL "indigo")
23+
file(DOWNLOAD http://curl.haxx.se/ca/cacert.pem ${CMAKE_BINARY_DIR}/cacert.pem)
24+
catkin_generate_virtualenv(
25+
PYTHON_INTERPRETER python2
26+
# https://stackoverflow.com/questions/25981703/pip-install-fails-with-connection-error-ssl-certificate-verify-failed
27+
EXTRA_PIP_ARGS -vvv --cert=${CMAKE_BINARY_DIR}/cacert.pem
28+
)
2229
else()
2330
catkin_generate_virtualenv(
2431
PYTHON_INTERPRETER python2

ros_speech_recognition/CMakeLists.txt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,16 @@ if($ENV{ROS_DISTRO} STREQUAL "indigo" OR
2929
COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/requirements.txt.indigo ${CMAKE_CURRENT_SOURCE_DIR}/requirements.txt
3030
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
3131
)
32-
catkin_generate_virtualenv(PYTHON_INTERPRETER python2)
32+
if("$ENV{ROS_DISTRO}" STREQUAL "indigo")
33+
file(DOWNLOAD http://curl.haxx.se/ca/cacert.pem ${CMAKE_BINARY_DIR}/cacert.pem)
34+
catkin_generate_virtualenv(
35+
PYTHON_INTERPRETER python2
36+
# https://stackoverflow.com/questions/25981703/pip-install-fails-with-connection-error-ssl-certificate-verify-failed
37+
EXTRA_PIP_ARGS -vvv --cert=${CMAKE_BINARY_DIR}/cacert.pem
38+
)
39+
else()
40+
catkin_generate_virtualenv(PYTHON_INTERPRETER python2)
41+
endif()
3342
else()
3443
catkin_generate_virtualenv(
3544
PYTHON_INTERPRETER python3

sesame_ros/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@ if($ENV{ROS_DISTRO} STRGREATER "melodic")
2424
catkin_generate_virtualenv(
2525
PYTHON_INTERPRETER python3
2626
)
27+
elseif("$ENV{ROS_DISTRO}" STREQUAL "indigo")
28+
file(DOWNLOAD http://curl.haxx.se/ca/cacert.pem ${CMAKE_BINARY_DIR}/cacert.pem)
29+
catkin_generate_virtualenv(
30+
PYTHON_INTERPRETER python2
31+
# https://stackoverflow.com/questions/25981703/pip-install-fails-with-connection-error-ssl-certificate-verify-failed
32+
EXTRA_PIP_ARGS -vvv --cert=${CMAKE_BINARY_DIR}/cacert.pem
33+
)
2734
else()
2835
catkin_generate_virtualenv(
2936
PYTHON_INTERPRETER python2

0 commit comments

Comments
 (0)