fixing catkin_destination not being called

cmake/catkin-pip-package.cmake.in

@@ -76,10 +76,8 @@ function(catkin_pip_python_setup)
 
 endfunction()
 
-# TODO : we now create an actual cmake target -> rename to catkin_pip_target ?
-function(catkin_pip_package package_name)
 
-    set(${PROJECT_NAME}_PIP_TARGET ${package_name} CACHE STRING "Make target generated to install this pip package as --editable for development")
+function(catkin_pip_target package_name)
 
     set (extra_macro_args ${ARGN})
 
@@ -92,6 +90,8 @@ function(catkin_pip_package package_name)
         set(package_path ${CMAKE_CURRENT_SOURCE_DIR})
     endif()
 
+    set(${PROJECT_NAME}_PIP_TARGET ${package_name} CACHE STRING "Make target generated to install this pip package as --editable for development")
+
     # Note : environment should already be setup at configure time for devel
 
     # Then we can run the pip command
@@ -114,10 +114,16 @@ function(catkin_pip_package package_name)
 
     # TODO : we might want to generate a package.xml on the fly from setup.py contents...
 
-    # Hijacking catkin scripts again
-    #set(_PACKAGE_XML_DIRECTORY ${package_path})
+endfunction()
+
+
+# BWCOMPAT : eventually get rid of that...
+macro(catkin_pip_package package_name)
+
+    catkin_pip_target(${package_name} ${ARGN})
 
     # Here we plug back into usual catkin package build flow
+    # CAREFUL : this will set variables into current scope.
     catkin_package()
 
-endfunction()
+endmacro()

test/CMakeLists.txt

@@ -150,4 +150,6 @@ if (CATKIN_ENABLE_TESTING)
         ${cookiecutter_pypackage_minimal_PIP_TARGET}      # from pypackage-minimal
     )
 
+    #TODO : a way to verified installed files from cmake ???
+
 endif()

test/catkin_pip_pytest/test_import.py

@@ -12,7 +12,7 @@ def test_dynamic_import_devel_space_pkgs():
 
 
 # If all packages are in the sys.path, we can import them
-def test_dynamic_import_vedel_pkg():
+def test_dynamic_import_devel_pkg():
     importlib.import_module('mypippkg')
     importlib.import_module('nameless')
     importlib.import_module('python_boilerplate')

test/distutils-setup/CMakeLists.txt

@@ -6,13 +6,23 @@ 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...
 
+# Testing potential extra files installation
+install(FILES extra_installs/bin.txt DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
+install(FILES extra_installs/etc.txt DESTINATION ${CATKIN_PACKAGE_ETC_DESTINATION})
+install(FILES extra_installs/include.txt DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})
+install(FILES extra_installs/lib.txt DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
+install(FILES extra_installs/python.txt DESTINATION ${CATKIN_PACKAGE_PYTHON_DESTINATION})
+install(FILES extra_installs/share.txt DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
+
 ## Unit tests
 if (CATKIN_ENABLE_TESTING)
     catkin_add_nosetests(${PIP_PROJECT_DIR}/test DEPENDENCIES dstest)

test/distutils-setup/extra_installs/bin.txt

@@ -0,0 +1,2 @@
+# Test file that should be installed in ${CATKIN_PACKAGE_BIN_DESTINATION}
+# Ref : http://docs.ros.org/kinetic/api/catkin/html/user_guide/variables.html

test/distutils-setup/extra_installs/etc.txt

@@ -0,0 +1,2 @@
+# Test file that should be installed in ${CATKIN_PACKAGE_ETC_DESTINATION}
+# Ref : http://docs.ros.org/kinetic/api/catkin/html/user_guide/variables.html

test/distutils-setup/extra_installs/include.txt

@@ -0,0 +1,2 @@
+# Test file that should be installed in ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
+# Ref : http://docs.ros.org/kinetic/api/catkin/html/user_guide/variables.html

test/distutils-setup/extra_installs/lib.txt

@@ -0,0 +1,2 @@
+# Test file that should be installed in ${CATKIN_PACKAGE_LIB_DESTINATION}
+# Ref : http://docs.ros.org/kinetic/api/catkin/html/user_guide/variables.html

test/distutils-setup/extra_installs/python.txt

@@ -0,0 +1,2 @@
+# Test file that should be installed in ${CATKIN_PACKAGE_PYTHON_DESTINATION}
+# Ref : http://docs.ros.org/kinetic/api/catkin/html/user_guide/variables.html

test/distutils-setup/extra_installs/share.txt

@@ -0,0 +1,2 @@
+# Test file that should be installed in ${CATKIN_PACKAGE_SHARE_DESTINATION}
+# Ref : http://docs.ros.org/kinetic/api/catkin/html/user_guide/variables.html

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...
 

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...
 

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...
 

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...
 

test/setuptools-setup/CMakeLists.txt

@@ -6,13 +6,23 @@ 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...
 
+# Testing potential extra files installation
+install(FILES extra_installs/bin.txt DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
+install(FILES extra_installs/etc.txt DESTINATION ${CATKIN_PACKAGE_ETC_DESTINATION})
+install(FILES extra_installs/include.txt DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})
+install(FILES extra_installs/lib.txt DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
+install(FILES extra_installs/python.txt DESTINATION ${CATKIN_PACKAGE_PYTHON_DESTINATION})
+install(FILES extra_installs/share.txt DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
+
 ## Unit tests
 if (CATKIN_ENABLE_TESTING)
     catkin_add_nosetests(${PIP_PROJECT_DIR}/test DEPENDENCIES sstest)

test/setuptools-setup/extra_installs/bin.txt

@@ -0,0 +1,2 @@
+# Test file that should be installed in ${CATKIN_PACKAGE_BIN_DESTINATION}
+# Ref : http://docs.ros.org/kinetic/api/catkin/html/user_guide/variables.html

test/setuptools-setup/extra_installs/etc.txt

@@ -0,0 +1,2 @@
+# Test file that should be installed in ${CATKIN_PACKAGE_ETC_DESTINATION}
+# Ref : http://docs.ros.org/kinetic/api/catkin/html/user_guide/variables.html

test/setuptools-setup/extra_installs/include.txt

@@ -0,0 +1,2 @@
+# Test file that should be installed in ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
+# Ref : http://docs.ros.org/kinetic/api/catkin/html/user_guide/variables.html

test/setuptools-setup/extra_installs/lib.txt

@@ -0,0 +1,2 @@
+# Test file that should be installed in ${CATKIN_PACKAGE_LIB_DESTINATION}
+# Ref : http://docs.ros.org/kinetic/api/catkin/html/user_guide/variables.html

test/setuptools-setup/extra_installs/python.txt

@@ -0,0 +1,2 @@
+# Test file that should be installed in ${CATKIN_PACKAGE_PYTHON_DESTINATION}
+# Ref : http://docs.ros.org/kinetic/api/catkin/html/user_guide/variables.html

test/setuptools-setup/extra_installs/share.txt

@@ -0,0 +1,2 @@
+# Test file that should be installed in ${CATKIN_PACKAGE_SHARE_DESTINATION}
+# Ref : http://docs.ros.org/kinetic/api/catkin/html/user_guide/variables.html