Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix input requirements warning #58

Merged
merged 2 commits into from
May 27, 2020
Merged

Fix input requirements warning #58

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
488fa2b
Only warn about INPUT_REQUIREMENTS if a package exports requirements …
paulbovbel May 27, 2020
0c99818
Update catkin_virtualenv/cmake/catkin_generate_virtualenv.cmake
paulbovbel May 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions catkin_virtualenv/cmake/catkin_generate_virtualenv.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ function(catkin_generate_virtualenv)
set(lock_args "${lock_args} --no-deps")
endif()

if(NOT DEFINED ARG_INPUT_REQUIREMENTS)
message(WARNING "Please define an INPUT_REQUIREMENTS and generate a lock file - see https://github.com/locusrobotics/catkin_virtualenv/blob/master/README.md#locking-dependencies")
endif()

if (NOT DEFINED ARG_EXTRA_PIP_ARGS)
set(ARG_EXTRA_PIP_ARGS "-qq" "--retries 10" "--timeout 30")
endif()
Expand Down Expand Up @@ -102,6 +98,10 @@ function(catkin_generate_virtualenv)
${CMAKE_BINARY_DIR}/${venv_dir}/bin/python
${CMAKE_SOURCE_DIR}/${ARG_INPUT_REQUIREMENTS}
)

elseif(NOT DEFINED ARG_INPUT_REQUIREMENTS AND NOT package_requirements STREQUAL "")
message(WARNING "Please define an INPUT_REQUIREMENTS block and generate a lock file - see https://github.com/locusrobotics/catkin_virtualenv/blob/master/README.md#locking-dependencies")

endif()

add_custom_command(COMMENT "Install requirements to ${CMAKE_BINARY_DIR}/${venv_dir}"
Expand Down