tests are now using the new catkin_pip_target and calling catkin_pack…

…age directly.
pyros-dev · Aug 10, 2017 · 6f95cb0 · 6f95cb0
1 parent 5b799e9
commit 6f95cb0
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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...