Merge pull request #83 from nim65s/devel

remove gepetto-viewer-server, fix #74, fix #83
Gepetto · Oct 18, 2018 · d5f10f6 · d5f10f6
2 parents 928b53c + 06e41ba
commit d5f10f6
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 61 deletions.
diff --git a/include/gepetto/viewer/corba/doc.hh b/include/gepetto/viewer/corba/doc.hh
@@ -6,7 +6,7 @@
 ///
 /// To use the graphical interface via python,
 /// \li start executable
-///     \code{bash} gepetto-viewer-server \endcode.
+///     \code{bash} gepetto-gui \endcode.
 /// \li in a python terminal, create a client
 /// \code{py}
 /// from gepetto.corbaserver import Client

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -78,15 +78,6 @@ IF(NOT CLIENT_ONLY)
 
   INSTALL(TARGETS ${LIBRARY_NAME} DESTINATION lib)
 
-  # Standalone corba server
-  ADD_EXECUTABLE (gepetto-viewer-server corbaserver.cc)
-  TARGET_LINK_LIBRARIES(gepetto-viewer-server ${LIBRARY_NAME})
-  PKG_CONFIG_USE_DEPENDENCY(gepetto-viewer-server omniORB4)
-  PKG_CONFIG_USE_DEPENDENCY(gepetto-viewer-server gepetto-viewer)
-  #TARGET_LINK_LIBRARIES(gepetto-viewer-server ${Boost_LIBRARIES})
-
-  INSTALL (TARGETS gepetto-viewer-server DESTINATION bin)
-
 ELSE(NOT CLIENT_ONLY)
 
   ADD_CUSTOM_TARGET(generate_idl_cpp ALL DEPENDS ${ALL_IDL_CPP_STUBS})

diff --git a/src/corbaserver.cc b/src/corbaserver.cc