From 6f95cb06a794c597844d10ccf6614f3173391724 Mon Sep 17 00:00:00 2001 From: AlexV Date: Thu, 10 Aug 2017 17:38:11 +0900 Subject: [PATCH] tests are now using the new catkin_pip_target and calling catkin_package directly. --- test/distutils-setup/CMakeLists.txt | 6 ++++-- test/pipproject/CMakeLists.txt | 6 ++++-- test/pylibrary/CMakeLists.txt | 6 ++++-- test/pypackage-minimal/CMakeLists.txt | 6 ++++-- test/pypackage/CMakeLists.txt | 6 ++++-- test/setuptools-setup/CMakeLists.txt | 6 ++++-- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/test/distutils-setup/CMakeLists.txt b/test/distutils-setup/CMakeLists.txt index 2ae9d39..07c7522 100644 --- a/test/distutils-setup/CMakeLists.txt +++ b/test/distutils-setup/CMakeLists.txt @@ -6,10 +6,12 @@ set (PIP_PROJECT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/distutils_setup) find_package(catkin REQUIRED COMPONENTS catkin_pip) -# This replace both catkin_python_setup() and catkin_package() +# This replace catkin_python_setup() # For devel, this will install all your unsatisfied pip dependencies. # Upon install, this will bark if some dependencies are not already satisfied (by ROS). -catkin_pip_package(dstest ${PIP_PROJECT_DIR}) +catkin_pip_target(dstest ${PIP_PROJECT_DIR}) + +catkin_package() # CAREFUL : all projects for test here will share the same workspace. pip might have conflicts... diff --git a/test/pipproject/CMakeLists.txt b/test/pipproject/CMakeLists.txt index 862d198..aa6a034 100644 --- a/test/pipproject/CMakeLists.txt +++ b/test/pipproject/CMakeLists.txt @@ -15,10 +15,12 @@ catkin_pip_requirements(${PIP_PROJECT_DIR}/requirements.txt --ignore-installed) # However this also means that existing packages in the workspace will not be used to satisfy requirements, # and will be reinstalled everytime... -# This replace both catkin_python_setup() and catkin_package() +# This replace catkin_python_setup() # For devel, this will install all your unsatisfied pip dependencies. # Upon install, this will bark if some dependencies are not already satisfied (by ROS). -catkin_pip_package(mypippkg ${PIP_PROJECT_DIR}) +catkin_pip_target(mypippkg ${PIP_PROJECT_DIR}) + +catkin_package() # CAREFUL : all projects for test here will share the same workspace. pip might have conflicts... diff --git a/test/pylibrary/CMakeLists.txt b/test/pylibrary/CMakeLists.txt index b9f5922..af85b54 100644 --- a/test/pylibrary/CMakeLists.txt +++ b/test/pylibrary/CMakeLists.txt @@ -11,10 +11,12 @@ find_package(catkin REQUIRED COMPONENTS catkin_pip) # no requirements file in this project template -# This replace both catkin_python_setup() and catkin_package() +# This replace catkin_python_setup() # For devel, this will install all your unsatisfied pip dependencies. # Upon install, this will bark if some dependencies are not already satisfied (by ROS). -catkin_pip_package(nameless ${PIP_PROJECT_DIR}) +catkin_pip_target(nameless ${PIP_PROJECT_DIR}) + +catkin_package() # CAREFUL : all projects for test here will share the same workspace. pip might have conflicts... diff --git a/test/pypackage-minimal/CMakeLists.txt b/test/pypackage-minimal/CMakeLists.txt index 88f028e..11953d9 100644 --- a/test/pypackage-minimal/CMakeLists.txt +++ b/test/pypackage-minimal/CMakeLists.txt @@ -11,10 +11,12 @@ find_package(catkin REQUIRED COMPONENTS catkin_pip) # no requirements file here -# This replace both catkin_python_setup() and catkin_package() +# This replace catkin_python_setup() # For devel, this will install all your unsatisfied pip dependencies. # Upon install, this will bark if some dependencies are not already satisfied (by ROS). -catkin_pip_package(cookiecutter_pypackage_minimal ${PIP_PROJECT_DIR}) +catkin_pip_target(cookiecutter_pypackage_minimal ${PIP_PROJECT_DIR}) + +catkin_package # CAREFUL : all projects for test here will share the same workspace. pip might have conflicts... diff --git a/test/pypackage/CMakeLists.txt b/test/pypackage/CMakeLists.txt index 9a08c05..71dea0f 100644 --- a/test/pypackage/CMakeLists.txt +++ b/test/pypackage/CMakeLists.txt @@ -18,10 +18,12 @@ catkin_pip_requirements(${PIP_PROJECT_DIR}/requirements_dev.txt --ignore-install # However this also means that existing packages in the workspace will not be used to satisfy requirements, # and will be reinstalled everytime... -# This replace both catkin_python_setup() and catkin_package() +# This replace catkin_python_setup() # For devel, this will install all your unsatisfied pip dependencies. # Upon install, this will bark if some dependencies are not already satisfied (by ROS). -catkin_pip_package(python_boilerplate ${PIP_PROJECT_DIR}) +catkin_pip_target(python_boilerplate ${PIP_PROJECT_DIR}) + +catkin_package() # CAREFUL : all projects for test here will share the same workspace. pip might have conflicts... diff --git a/test/setuptools-setup/CMakeLists.txt b/test/setuptools-setup/CMakeLists.txt index 8dec817..8aa708c 100644 --- a/test/setuptools-setup/CMakeLists.txt +++ b/test/setuptools-setup/CMakeLists.txt @@ -6,10 +6,12 @@ set (PIP_PROJECT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/setuptools_setup) find_package(catkin REQUIRED COMPONENTS catkin_pip) -# This replace both catkin_python_setup() and catkin_package() +# This replace catkin_python_setup() # For devel, this will install all your unsatisfied pip dependencies. # Upon install, this will bark if some dependencies are not already satisfied (by ROS). -catkin_pip_package(sstest ${PIP_PROJECT_DIR}) +catkin_pip_target(sstest ${PIP_PROJECT_DIR}) + +catkin_package() # CAREFUL : all projects for test here will share the same workspace. pip might have conflicts...