From 1c93e8242dc858c6c31fbb2ae6ad98492a5d4c65 Mon Sep 17 00:00:00 2001 From: Paul Bovbel Date: Wed, 8 Jul 2020 15:35:24 -0400 Subject: [PATCH 1/2] Don't require catkin_package to be called before catkin_generate_virtualenv --- README.md | 3 --- catkin_virtualenv/cmake/catkin_generate_virtualenv.cmake | 4 +++- test_catkin_virtualenv/CMakeLists.txt | 5 +++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 6a08a2a..17e1397 100644 --- a/README.md +++ b/README.md @@ -68,9 +68,6 @@ In CMakeLists.txt: # Make sure to find-package `catkin_virtualenv` find_package(catkin REQUIRED ... catkin_virtualenv ...) -# Must be called before catkin_generate_virtualenv -catkin_package() - # Generate the virtualenv catkin_generate_virtualenv() diff --git a/catkin_virtualenv/cmake/catkin_generate_virtualenv.cmake b/catkin_virtualenv/cmake/catkin_generate_virtualenv.cmake index 6c3c1f8..3af22ec 100644 --- a/catkin_virtualenv/cmake/catkin_generate_virtualenv.cmake +++ b/catkin_virtualenv/cmake/catkin_generate_virtualenv.cmake @@ -57,8 +57,10 @@ function(catkin_generate_virtualenv) return() endif() - ### Start building virtualenv + # Make sure CATKIN_* paths are initialized + catkin_destinations() + ### Start building virtualenv set(venv_dir venv) set(venv_devel_dir ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_SHARE_DESTINATION}/${venv_dir}) diff --git a/test_catkin_virtualenv/CMakeLists.txt b/test_catkin_virtualenv/CMakeLists.txt index 4927c96..c907670 100644 --- a/test_catkin_virtualenv/CMakeLists.txt +++ b/test_catkin_virtualenv/CMakeLists.txt @@ -3,12 +3,13 @@ project(test_catkin_virtualenv) find_package(catkin REQUIRED COMPONENTS catkin_virtualenv) -catkin_package() - catkin_generate_virtualenv( INPUT_REQUIREMENTS requirements.in ) +# Order with catkin_generate_virtualenv shouldn't matter +catkin_package() + install(FILES requirements.txt DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) From 3fb1ca03a7c4c591df7b9f9b1066fb017d6ad3de Mon Sep 17 00:00:00 2001 From: Paul Bovbel Date: Thu, 9 Jul 2020 12:51:04 -0400 Subject: [PATCH 2/2] Update catkin_generate_virtualenv.cmake --- catkin_virtualenv/cmake/catkin_generate_virtualenv.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catkin_virtualenv/cmake/catkin_generate_virtualenv.cmake b/catkin_virtualenv/cmake/catkin_generate_virtualenv.cmake index 3af22ec..0dc1a42 100644 --- a/catkin_virtualenv/cmake/catkin_generate_virtualenv.cmake +++ b/catkin_virtualenv/cmake/catkin_generate_virtualenv.cmake @@ -58,7 +58,7 @@ function(catkin_generate_virtualenv) endif() # Make sure CATKIN_* paths are initialized - catkin_destinations() + catkin_destinations() # oh the places we'll go ### Start building virtualenv set(venv_dir venv)