Commit 4ccd7184 authored by Joseph Mirabel's avatar Joseph Mirabel Committed by Joseph Mirabel
Browse files

Update install of client only

parent da33ffed
......@@ -46,10 +46,11 @@ IF (HPP_DEBUG)
ENDIF()
# Search for dependencies.
ADD_REQUIRED_DEPENDENCY("omniORB4 >= 4.1.4")
ADD_REQUIRED_DEPENDENCY("hpp-corbaserver >= 4")
IF (NOT CLIENT_ONLY)
ADD_DOC_DEPENDENCY ("hpp-core >= 3")
ADD_REQUIRED_DEPENDENCY("hpp-wholebody-step >= 4")
ADD_REQUIRED_DEPENDENCY("hpp-corbaserver >= 4")
ADD_REQUIRED_DEPENDENCY("hpp-template-corba >= 1.1")
ADD_REQUIRED_DEPENDENCY("hpp-util >= 3.2")
ENDIF (NOT CLIENT_ONLY)
......@@ -67,10 +68,7 @@ ADD_SUBDIRECTORY(src)
CONFIG_FILES (include/hpp/corbaserver/wholebody-step/doc.hh)
IF (NOT CLIENT_ONLY)
PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME})
ENDIF (NOT CLIENT_ONLY)
PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME})
SETUP_PROJECT_FINALIZE()
SETUP_PROJECT_CPACK()
......@@ -15,6 +15,7 @@
# hpp-wholebody-step-corba. If not, see
# <http://www.gnu.org/licenses/>.
SET(LIBRARY_NAME ${PROJECT_NAME})
SET(IDL_SOURCES
problem)
......@@ -42,8 +43,10 @@ FOREACH(IDL ${IDL_SOURCES})
)
ENDFOREACH()
ADD_CUSTOM_TARGET(generate_idl_cpp DEPENDS ${ALL_IDL_CPP_STUBS})
ADD_CUSTOM_TARGET(generate_idl_python DEPENDS ${ALL_IDL_PYTHON_STUBS})
IF (NOT CLIENT_ONLY)
SET(LIBRARY_NAME ${PROJECT_NAME})
ADD_LIBRARY(${LIBRARY_NAME}
SHARED
server.cc
......@@ -52,11 +55,6 @@ IF (NOT CLIENT_ONLY)
${CMAKE_CURRENT_BINARY_DIR}/hpp/corbaserver/wholebody-step/problemSK.cc
)
ADD_CUSTOM_TARGET(generate_idl_cpp DEPENDS ${ALL_IDL_CPP_STUBS})
ADD_CUSTOM_TARGET(generate_idl_python DEPENDS ${ALL_IDL_PYTHON_STUBS})
ADD_DEPENDENCIES (${LIBRARY_NAME} generate_idl_cpp)
ADD_DEPENDENCIES (${LIBRARY_NAME} generate_idl_python)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-wholebody-step)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-template-corba)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} hpp-util)
......@@ -73,10 +71,20 @@ IF (NOT CLIENT_ONLY)
INSTALL (TARGETS hpp-wholebody-step-server DESTINATION ${CMAKE_INSTALL_BINDIR})
ELSE (NOT CLIENT_ONLY)
ADD_CUSTOM_TARGET(generate_idl_cpp ALL DEPENDS ${ALL_IDL_CPP_STUBS})
ADD_CUSTOM_TARGET(generate_idl_python ALL DEPENDS ${ALL_IDL_PYTHON_STUBS})
ADD_LIBRARY(${LIBRARY_NAME}
SHARED
${CMAKE_CURRENT_BINARY_DIR}/hpp/corbaserver/wholebody-step/problem.hh
${CMAKE_CURRENT_BINARY_DIR}/hpp/corbaserver/wholebody-step/problemSK.cc
)
PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} omniORB4)
INSTALL(TARGETS ${LIBRARY_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
ENDIF (NOT CLIENT_ONLY)
ADD_DEPENDENCIES (${LIBRARY_NAME} generate_idl_cpp)
ADD_DEPENDENCIES (${LIBRARY_NAME} generate_idl_python)
INSTALL(
FILES
${CMAKE_CURRENT_SOURCE_DIR}/hpp/corbaserver/wholebody_step/__init__.py
......
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