Skip to content
This repository has been archived by the owner on Feb 21, 2021. It is now read-only.

Outsource build (2): interfaces + gazeboserver/plugins #237

Merged
merged 10 commits into from Nov 23, 2015

Conversation

varhub
Copy link
Contributor

@varhub varhub commented Nov 15, 2015

Outsource build (2)

Refer to #236

Changes:

  • gazeboserver/plugins
  • src/stable/interfaces

Fixes:

  • Use ${CMAKE_CURRENT_BINARY_DIR} for all generated objects
  • Use correct namespaces for .ice files
    from:
#include <common.h>
module jderobot {

to:

#include <jderobot/common.h>
module jderobot {

Therefore, include_directories() must only include cpp root (maintain old for backward compatibility)

  • Full rewrite of slice2xx to allow complex hierarchies (modules==file tree)

Unresolved issues:

  • slice2py syntax is odd. It realizes a flattened generation plus hierarchical __init__.py
    By the way, same problem was happening before, so it maintains exactly same format than before.
  • module hierarchy is weird, (refer to java tree), interface jointmotor is not part of jderobot
module RoboCompJointMotor{

instead of

module jderobot{
module RoboCompJointMotor{

Tested:

  • cpp (compile + quadrotor)
  • python (introrob_py)

Video demo:

http://jderobot.org/store/varribas/uploads/videos/tfm-pretty-cmake.mp4

@varhub
Copy link
Contributor Author

varhub commented Nov 19, 2015

Please @fqez, test it when you have time.

@fqez
Copy link
Member

fqez commented Nov 23, 2015

Tested!

fqez added a commit that referenced this pull request Nov 23, 2015
…build

Outsource build (2): interfaces + gazeboserver/plugins
@fqez fqez merged commit 07f8e87 into JdeRobot:master Nov 23, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants