merged catkin build into master branch

This commit is contained in:
matlabbe
2015-05-20 14:50:25 -04:00
parent a4ef95a3bf
commit 84cf6280ac
15 changed files with 1439 additions and 253 deletions
+3 -1
View File
@@ -2,4 +2,6 @@ ADD_SUBDIRECTORY( tcpClient )
ADD_SUBDIRECTORY( tcpImagesServer )
ADD_SUBDIRECTORY( tcpRequest )
ADD_SUBDIRECTORY( tcpService )
ADD_SUBDIRECTORY( similarity )
IF(NONFREE)
ADD_SUBDIRECTORY( similarity )
ENDIF(NONFREE)