[wip/morse] Set PYTHON-* variables for CMake, fixed doc and some paths

Sphinx, used to generate the doc, requires Python2 while MORSE requires
Python3.
Some magic in the CMakeFile solve the issue (using PYTHON3_EXECUTABLE
for Python3 and PYTHON_EXECUTABLE for Python2)

While here, fixed paths to viman-genom and genBasic.

morse/Makefile

@@ -17,8 +17,9 @@
 #                                          Severin Lemaignan on Fri May 28 2010
 #
 
-DISTNAME=	    	morse-${PKGVERSION}
-PKGVERSION=	    	0.2
+DISTNAME=	    	morse-${VERSION}
+VERSION=	    	0.2
+PKGREVISION=		1
 MASTER_SITES=		${MASTER_SITE_OPENROBOTS:=morse/}
 MASTER_REPOSITORY=	git ssh://trac.laas.fr/git/robots/morse
 
@@ -31,6 +32,10 @@ LICENSE=		modified-bsd
 USE_LANGUAGES+=		c c++ python
 PYTHON_REQUIRED=	>=3
 
+CMAKE_ARGS+=            -DPYTHON3_EXECUTABLE=${PYTHON}
+CMAKE_ARGS+=            -DPYTHON3_INCLUDE_PATH=${PYTHON_INCLUDE}
+CMAKE_ARGS+=            -DPYTHON3_LIBRARY=${PYTHON_LIB}
+
 BUILD_TARGET=		all
 INSTALL_TARGET=		install
 
@@ -65,12 +70,10 @@ define PKG_OPTION_SET.pocolibs-outdoor
   CMAKE_ARGS+=		-DBUILD_POCOLIBS_SUPPORT=ON
   CMAKE_ARGS+=		-DBUILD_POCOLIBS_POM_SUPPORT=ON
   CMAKE_ARGS+=		-DBUILD_POCOLIBS_VIAM_SUPPORT=ON
-  CMAKE_ARGS+=		-DBUILD_POCOLIBS_SICK_SUPPORT=ON
   CMAKE_ARGS+=		-DBUILD_POCOLIBS_PLATINE_SUPPORT=ON
   CMAKE_ARGS+=		-DBUILD_POCOLIBS_GENPOS_SUPPORT=ON
 
-  include ../../architecture/genPos-genom/depend.mk
-  include ../../hardware/sick-genom/depend.mk
+  include ../../interfaces/genPos-genom/depend.mk
   include ../../image/viam-genom/depend.mk
   include ../../localization/pom-genom/depend.mk
 
@@ -88,11 +91,11 @@ define PKG_OPTION_SET.pocolibs-hri
   CMAKE_ARGS+=		-DBUILD_POCOLIBS_GENPOS_SUPPORT=ON
   CMAKE_ARGS+=		-DBUILD_POCOLIBS_PLATINE_SUPPORT=ON
 
-  include ../../architecture/genPos-genom/depend.mk
+  include ../../interfaces/genPos-genom/depend.mk
   include ../../localization/pom-genom/depend.mk
   include ../../wip/lwr-genom/depend.mk
   include ../../wip/spark-genom/depend.mk
-  include ../../wip/viman-genom/depend.mk
+  include ../../image/viman-genom/depend.mk
 
 endef
 
@@ -104,20 +107,18 @@ define PKG_OPTION_SET.pocolibs-all
   CMAKE_ARGS+=		-DBUILD_POCOLIBS_SUPPORT=ON
   CMAKE_ARGS+=		-DBUILD_POCOLIBS_POM_SUPPORT=ON
   CMAKE_ARGS+=		-DBUILD_POCOLIBS_VIAM_SUPPORT=ON
-  CMAKE_ARGS+=		-DBUILD_POCOLIBS_SICK_SUPPORT=ON
   CMAKE_ARGS+=		-DBUILD_POCOLIBS_PLATINE_SUPPORT=ON
   CMAKE_ARGS+=		-DBUILD_POCOLIBS_GENPOS_SUPPORT=ON
   CMAKE_ARGS+=		-DBUILD_POCOLIBS_LWR_SUPPORT=ON
   CMAKE_ARGS+=		-DBUILD_POCOLIBS_VIMAN_SUPPORT=ON
   CMAKE_ARGS+=		-DBUILD_POCOLIBS_HUMAN_POSTURE_SUPPORT=ON
  
-  include ../../architecture/genPos-genom/depend.mk
-  include ../../hardware/sick-genom/depend.mk
+  include ../../interfaces/genPos-genom/depend.mk
   include ../../image/viam-genom/depend.mk
   include ../../localization/pom-genom/depend.mk
   include ../../wip/lwr-genom/depend.mk
   include ../../wip/spark-genom/depend.mk
-  include ../../wip/viman-genom/depend.mk
+  include ../../image/viman-genom/depend.mk
 
 endef
 

morse/distinfo

 SHA1 (morse-0.2.tar.gz) = e6b304fb31c75c56c4b2accad1569d8c951992c3
 RMD160 (morse-0.2.tar.gz) = 68c76030e9f2a25e0b9c1535f230c59f30e8a9b1
 Size (morse-0.2.tar.gz) = 33380097 bytes
+SHA1 (patch-aa) = c56ca7ce118e2bfcaa70898034056157b7a1af5a

morse/patches/patch-aa

+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2119c22..ff43cf0 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -71,37 +71,43 @@ FIND_PROGRAM(SPHINX_BUILD NAMES sphinx-build)
+ IF (NOT SPHINX_BUILD)
+ 	MESSAGE(STATUS "Can't find sphinx-build : will not build the documentation")
+ ELSE()
+-	SET (SPHINX_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/doc/html)
+-	SET (SPHINX_LATEX_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/doc/tex)
+-	ADD_CUSTOM_COMMAND(
+-		OUTPUT ${SPHINX_OUTPUT}
+-		COMMAND ${SPHINX_BUILD} -b html
+-							    -c ${CMAKE_CURRENT_BINARY_DIR}/doc
+-								   ${CMAKE_CURRENT_SOURCE_DIR}/doc/morse
+-								   ${SPHINX_OUTPUT}
+-	)
+-
+-	ADD_CUSTOM_TARGET(doc ALL DEPENDS ${SPHINX_OUTPUT})
+-
+-	INSTALL(DIRECTORY ${SPHINX_OUTPUT}
+-		    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/morse
+-			)
+-
+-	ADD_CUSTOM_TARGET(
+-		force_doc
+-		COMMAND sphinx-build -b html 
+-							 -c ${CMAKE_CURRENT_BINARY_DIR}/doc/
+-							 ${CMAKE_CURRENT_SOURCE_DIR}/doc/morse
+-							 ${SPHINX_OUTPUT}
+-	)
+-
+-	ADD_CUSTOM_TARGET(
+-		latex_doc
+-		COMMAND sphinx-build -b latex
+-							 -c ${CMAKE_CURRENT_BINARY_DIR}/doc/
+-							 ${CMAKE_CURRENT_SOURCE_DIR}/doc/morse
+-							 ${SPHINX_LATEX_OUTPUT}
+-	)
++	FIND_PACKAGE(PythonInterp)
++	IF (NOT PYTHONINTERP_FOUND) 
++		MESSAGE(STATUS "Can't find python2 executable : sphinx-build will not run")
++		MESSAGE(STATUS "Will not build the documentation")
++	ELSE()
++		SET (SPHINX_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/doc/html)
++		SET (SPHINX_LATEX_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/doc/tex)
++		ADD_CUSTOM_COMMAND(
++			OUTPUT ${SPHINX_OUTPUT}
++			COMMAND ${PYTHON_EXECUTABLE} ${SPHINX_BUILD} -b html
++								    -c ${CMAKE_CURRENT_BINARY_DIR}/doc
++									   ${CMAKE_CURRENT_SOURCE_DIR}/doc/morse
++									   ${SPHINX_OUTPUT}
++		)
++	
++		ADD_CUSTOM_TARGET(doc ALL DEPENDS ${SPHINX_OUTPUT})
++	
++		INSTALL(DIRECTORY ${SPHINX_OUTPUT}
++			    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/morse
++				)
++	
++		ADD_CUSTOM_TARGET(
++			force_doc
++			COMMAND ${PYTHON_EXECUTABLE} ${SPHINX_BUILD} -b html 
++								 -c ${CMAKE_CURRENT_BINARY_DIR}/doc/
++								 ${CMAKE_CURRENT_SOURCE_DIR}/doc/morse
++								 ${SPHINX_OUTPUT}
++		)
++	
++		ADD_CUSTOM_TARGET(
++			latex_doc
++			COMMAND ${PYTHON_EXECUTABLE} ${SPHINX_BUILD} -b latex
++								 -c ${CMAKE_CURRENT_BINARY_DIR}/doc/
++								 ${CMAKE_CURRENT_SOURCE_DIR}/doc/morse
++								 ${SPHINX_LATEX_OUTPUT}
++		)
++	ENDIF()
+ ENDIF()
+ 
+