Skip to content

Commit

Permalink
fixing default argument for catkin_pip_package
Browse files Browse the repository at this point in the history
fixing catkin_pure_python test build.
cosmetics.
  • Loading branch information
asmodehn committed Apr 1, 2016
1 parent d9d00b3 commit df89a2b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
11 changes: 9 additions & 2 deletions cmake/catkin-pip.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,16 @@ else ()

endif()

macro(catkin_pip_package package_path)
macro(catkin_pip_package)

if( NOT package_path)
set (extra_macro_args ${ARGN})

# Did we get any optional args?
list(LENGTH extra_macro_args num_extra_args)
if (${num_extra_args} GREATER 0)
list(GET extra_macro_args 0 package_path)
message ("Got package_path: ${package_path}")
else()
set(package_path .)
endif()
message(STATUS " ... Configuring ${package_path} as a Pip package ...")
Expand Down
5 changes: 1 addition & 4 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,12 @@ message(STATUS " ... Done ...")
# and make sure they still work with catkin by building them all as subprojects
#

include(mypippkg.cmake)


if (CATKIN_ENABLE_TESTING)

########################
# Nose Tests should work
########################

#catkin_add_nosetests(sampleproject/tests)
include(mypippkg.cmake)

endif()
1 change: 1 addition & 0 deletions test/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Project examples to use :
* [cookiecutter-pypa](https://github.com/audreyr/cookiecutter-pypackage)
*
* TODO : find more python package references
* TODO : add a ros package to prove it doesnt disturb normal ros process either (at least not too much...).

More tests will be added when we find more use cases that fit catkin_pure_python purpose

Expand Down

0 comments on commit df89a2b

Please sign in to comment.