Commit 20ea3c57 authored by Steve Tonneau's avatar Steve Tonneau
Browse files

merge

parent 10823b48
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
gepetto-viewer-server & gepetto-viewer-server &
hpp-rbprm-server & hpp-rbprm-server &
ipython -i ./$1 ipython -i --no-confirm-exit ./$1
pkill -f 'gepetto-viewer-server' pkill -f 'gepetto-viewer-server'
pkill -f 'hpp-rbprm-server' pkill -f 'hpp-rbprm-server'
#!/bin/bash #!/bin/bash
gepetto-viewer-server & gepetto-viewer-server &
ipython -i ./$1 ipython -i --no-confirm-exit ./$1
pkill -f 'gepetto-viewer-server' pkill -f 'gepetto-viewer-server'
...@@ -33,6 +33,15 @@ FINDPYTHON(2.7 EXACT REQUIRED) ...@@ -33,6 +33,15 @@ FINDPYTHON(2.7 EXACT REQUIRED)
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/src) INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/src)
FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/hpp/corbaserver/rbprm) FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/hpp/corbaserver/rbprm)
FOREACH(IDL ${IDL_SOURCES})
GENERATE_IDL_CPP (${IDL}
${CMAKE_SOURCE_DIR}/idl/hpp/corbaserver/rbprm
)
GENERATE_IDL_PYTHON (${IDL}
${CMAKE_SOURCE_DIR}/idl/hpp/corbaserver/rbprm
)
ENDFOREACH()
FOREACH(IDL ${IDL_SOURCES}) FOREACH(IDL ${IDL_SOURCES})
GENERATE_IDL_CPP (hpp/corbaserver/rbprm/${IDL} GENERATE_IDL_CPP (hpp/corbaserver/rbprm/${IDL}
${CMAKE_SOURCE_DIR}/idl/hpp/corbaserver/rbprm) ${CMAKE_SOURCE_DIR}/idl/hpp/corbaserver/rbprm)
...@@ -78,7 +87,6 @@ PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-rbprm) ...@@ -78,7 +87,6 @@ PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-rbprm)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-model-urdf) PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-model-urdf)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-corbaserver) PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-corbaserver)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} omniORB4) PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} omniORB4)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-rbprm)
INSTALL(TARGETS ${LIBRARY_NAME} DESTINATION lib) INSTALL(TARGETS ${LIBRARY_NAME} DESTINATION lib)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment