Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-22 01:11:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fixed installation of frc_gazebo_plugins and a few minor fixes."

Browse Source
This commit is contained in:
Alex Henning (WPI)
2014-07-21 14:12:38 -07:00
committed by Gerrit Code Review
parent f27e16735f afa39deec5
commit e962c770bb
13 changed files with 43 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.hgignore
View File

@@ -1,13 +0,0 @@
syntax: re
^\.hgignore$
.*/target(?:/|$)
.*/dist(?:/|$)
eclipse-plugins/.*/bin(?:/|$)
syntax: glob
wpilibc/build/
hal/build/
networktables/cpp/build/
build/
networktables/OutlineViewer/nbproject/private
*~

5
simulation/frc_gazebo_plugins/Makefile
View File

@@ -20,6 +20,7 @@ build:
copy-plugins:
mkdir -p plugins
cp msgs/build/libgz_msgs.so plugins
cp dc_motor/build/libgz_dc_motor.so plugins
cp pneumatic_piston/build/libgz_pneumatic_piston.so plugins
cp potentiometer/build/libgz_potentiometer.so plugins
@@ -41,6 +42,10 @@ clean: clean-docs
cd clock && make clean
-rm -r plugins
install: all
mkdir -p $(DESTDIR)$(plugin.dir)
install plugins/* $(DESTDIR)$(plugin.dir)
docs:
doxygen frc_gazebo_plugins.doxy

8
simulation/frc_gazebo_plugins/clock/CMakeLists.txt
View File

@@ -7,11 +7,11 @@ if (PKG_CONFIG_FOUND)
endif()
find_package(gazebo REQUIRED)
find_library(GZ_MSGS libgz_msgs.so ../msgs/build)
file(GLOB_RECURSE SRC_FILES src/*.cpp)
file(GLOB_RECURSE MSG_FILES ../msgs/src/*.cc)
include_directories(src ${Boost_INCLUDE_DIR} ${GAZEBO_INCLUDE_DIRS} ../msgs/src)
add_library(${PROJECT_NAME} SHARED ${SRC_FILES} ${MSG_FILES})
add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
link_directories(${GAZEBO_LIBRARY_DIRS} ../msgs/build)
target_link_libraries(${PROJECT_NAME} ${GAZEBO_LIBRARIES})
link_directories(${GAZEBO_LIBRARY_DIRS} ../msgs/build/)
target_link_libraries(${PROJECT_NAME} ${GZ_MSGS} ${GAZEBO_LIBRARIES})

8
simulation/frc_gazebo_plugins/dc_motor/CMakeLists.txt
View File

@@ -7,11 +7,11 @@ if (PKG_CONFIG_FOUND)
endif()
find_package(gazebo REQUIRED)
find_library(GZ_MSGS libgz_msgs.so ../msgs/build)
file(GLOB_RECURSE SRC_FILES src/*.cpp)
file(GLOB_RECURSE MSG_FILES ../msgs/src/*.cc)
include_directories(src ${Boost_INCLUDE_DIR} ${GAZEBO_INCLUDE_DIRS} ../msgs/src)
add_library(${PROJECT_NAME} SHARED ${SRC_FILES} ${MSG_FILES})
add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
link_directories(${GAZEBO_LIBRARY_DIRS} ../msgs/build)
target_link_libraries(${PROJECT_NAME} ${GAZEBO_LIBRARIES})
link_directories(${GAZEBO_LIBRARY_DIRS} ../msgs/build/)
target_link_libraries(${PROJECT_NAME} ${GZ_MSGS} ${GAZEBO_LIBRARIES})

8
simulation/frc_gazebo_plugins/encoder/CMakeLists.txt
View File

@@ -7,11 +7,11 @@ if (PKG_CONFIG_FOUND)
endif()
find_package(gazebo REQUIRED)
find_library(GZ_MSGS libgz_msgs.so ../msgs/build)
file(GLOB_RECURSE SRC_FILES src/*.cpp)
file(GLOB_RECURSE MSG_FILES ../msgs/src/*.cc)
include_directories(src ${Boost_INCLUDE_DIR} ${GAZEBO_INCLUDE_DIRS} ../msgs/src)
add_library(${PROJECT_NAME} SHARED ${SRC_FILES} ${MSG_FILES})
add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
link_directories(${GAZEBO_LIBRARY_DIRS} ../msgs/build)
target_link_libraries(${PROJECT_NAME} ${GAZEBO_LIBRARIES})
link_directories(${GAZEBO_LIBRARY_DIRS} ../msgs/build/)
target_link_libraries(${PROJECT_NAME} ${GZ_MSGS} ${GAZEBO_LIBRARIES})

8
simulation/frc_gazebo_plugins/frc_gazebo_plugins.doxy
View File

@@ -144,7 +144,7 @@ FULL_PATH_NAMES = YES
# will be relative from the directory where doxygen is started.
# This tag requires that the tag FULL_PATH_NAMES is set to YES.
STRIP_FROM_PATH =
STRIP_FROM_PATH =
# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
# path mentioned in the documentation of a class, which tells the reader which
@@ -234,7 +234,7 @@ TCL_SUBST =
# members will be omitted, etc.
# The default value is: NO.
OPTIMIZE_OUTPUT_FOR_C = YES
OPTIMIZE_OUTPUT_FOR_C = NO
# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
# Python sources only. Doxygen will then generate output that is more tailored
@@ -1335,7 +1335,7 @@ ECLIPSE_DOC_ID = org.doxygen.Project
# The default value is: NO.
# This tag requires that the tag GENERATE_HTML is set to YES.
DISABLE_INDEX = NO
DISABLE_INDEX = YES
# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
# structure should be generated to display hierarchical information. If the tag
@@ -1352,7 +1352,7 @@ DISABLE_INDEX = NO
# The default value is: NO.
# This tag requires that the tag GENERATE_HTML is set to YES.
GENERATE_TREEVIEW = NO
GENERATE_TREEVIEW = YES
# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
# doxygen will group on one line in the generated HTML documentation.

8
simulation/frc_gazebo_plugins/gyro/CMakeLists.txt
View File

@@ -7,11 +7,11 @@ if (PKG_CONFIG_FOUND)
endif()
find_package(gazebo REQUIRED)
find_library(GZ_MSGS libgz_msgs.so ../msgs/build)
file(GLOB_RECURSE SRC_FILES src/*.cpp)
file(GLOB_RECURSE MSG_FILES ../msgs/src/*.cc)
include_directories(src ${Boost_INCLUDE_DIR} ${GAZEBO_INCLUDE_DIRS} ../msgs/src)
add_library(${PROJECT_NAME} SHARED ${SRC_FILES} ${MSG_FILES})
add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
link_directories(${GAZEBO_LIBRARY_DIRS} ../msgs/build)
target_link_libraries(${PROJECT_NAME} ${GAZEBO_LIBRARIES})
link_directories(${GAZEBO_LIBRARY_DIRS} ../msgs/build/)
target_link_libraries(${PROJECT_NAME} ${GZ_MSGS} ${GAZEBO_LIBRARIES})

8
simulation/frc_gazebo_plugins/limit_switch/CMakeLists.txt
View File

@@ -7,11 +7,11 @@ if (PKG_CONFIG_FOUND)
endif()
find_package(gazebo REQUIRED)
find_library(GZ_MSGS libgz_msgs.so ../msgs/build)
file(GLOB_RECURSE SRC_FILES src/*.cpp)
file(GLOB_RECURSE MSG_FILES ../msgs/src/*.cc)
include_directories(src ${Boost_INCLUDE_DIR} ${GAZEBO_INCLUDE_DIRS} ../msgs/src)
add_library(${PROJECT_NAME} SHARED ${SRC_FILES} ${MSG_FILES})
add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
link_directories(${GAZEBO_LIBRARY_DIRS} ../msgs/build)
target_link_libraries(${PROJECT_NAME} ${GAZEBO_LIBRARIES})
link_directories(${GAZEBO_LIBRARY_DIRS} ../msgs/build/)
target_link_libraries(${PROJECT_NAME} ${GZ_MSGS} ${GAZEBO_LIBRARIES})

2
simulation/frc_gazebo_plugins/msgs/CMakeLists.txt
View File

@@ -13,4 +13,4 @@ include_directories(src ${Boost_INCLUDE_DIR} ${GAZEBO_INCLUDE_DIRS})
add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
link_directories(${GAZEBO_LIBRARY_DIRS})
target_link_libraries(${PROJECT_NAME} ${GAZEBO_LIBRARIES})
target_link_libraries(${PROJECT_NAME} ${GAZEBO_LIBRARIES})

8
simulation/frc_gazebo_plugins/pneumatic_piston/CMakeLists.txt
View File

@@ -7,11 +7,11 @@ if (PKG_CONFIG_FOUND)
endif()
find_package(gazebo REQUIRED)
find_library(GZ_MSGS libgz_msgs.so ../msgs/build)
file(GLOB_RECURSE SRC_FILES src/*.cpp)
file(GLOB_RECURSE MSG_FILES ../msgs/src/*.cc)
include_directories(src ${Boost_INCLUDE_DIR} ${GAZEBO_INCLUDE_DIRS} ../msgs/src)
add_library(${PROJECT_NAME} SHARED ${SRC_FILES} ${MSG_FILES})
add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
link_directories(${GAZEBO_LIBRARY_DIRS} ../msgs/build)
target_link_libraries(${PROJECT_NAME} ${GAZEBO_LIBRARIES})
link_directories(${GAZEBO_LIBRARY_DIRS} ../msgs/build/)
target_link_libraries(${PROJECT_NAME} ${GZ_MSGS} ${GAZEBO_LIBRARIES})

2
simulation/frc_gazebo_plugins/pneumatic_piston/src/pneumatic_piston.cpp
View File

@@ -22,7 +22,7 @@ void PneumaticPiston::Load(physics::ModelPtr model, sdf::ElementPtr sdf) {
}
forward_force = sdf->Get<double>("forward-force");
reverse_force = -sdf->Get<double>("reverse-force");
reverse_force = sdf->Get<double>("reverse-force");
if (sdf->HasElement("direction") && sdf->Get<std::string>("direction") == "reversed") {
forward_force = -forward_force;

8
simulation/frc_gazebo_plugins/potentiometer/CMakeLists.txt
View File

@@ -7,11 +7,11 @@ if (PKG_CONFIG_FOUND)
endif()
find_package(gazebo REQUIRED)
find_library(GZ_MSGS libgz_msgs.so ../msgs/build)
file(GLOB_RECURSE SRC_FILES src/*.cpp)
file(GLOB_RECURSE MSG_FILES ../msgs/src/*.cc)
include_directories(src ${Boost_INCLUDE_DIR} ${GAZEBO_INCLUDE_DIRS} ../msgs/src)
add_library(${PROJECT_NAME} SHARED ${SRC_FILES} ${MSG_FILES})
add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
link_directories(${GAZEBO_LIBRARY_DIRS} ../msgs/build)
target_link_libraries(${PROJECT_NAME} ${GAZEBO_LIBRARIES})
link_directories(${GAZEBO_LIBRARY_DIRS} ../msgs/build/)
target_link_libraries(${PROJECT_NAME} ${GZ_MSGS} ${GAZEBO_LIBRARIES})

8
simulation/frc_gazebo_plugins/rangefinder/CMakeLists.txt
View File

@@ -7,11 +7,11 @@ if (PKG_CONFIG_FOUND)
endif()
find_package(gazebo REQUIRED)
find_library(GZ_MSGS libgz_msgs.so ../msgs/build)
file(GLOB_RECURSE SRC_FILES src/*.cpp)
file(GLOB_RECURSE MSG_FILES ../msgs/src/*.cc)
include_directories(src ${Boost_INCLUDE_DIR} ${GAZEBO_INCLUDE_DIRS} ../msgs/src)
add_library(${PROJECT_NAME} SHARED ${SRC_FILES} ${MSG_FILES})
add_library(${PROJECT_NAME} SHARED ${SRC_FILES})
link_directories(${GAZEBO_LIBRARY_DIRS} ../msgs/build)
target_link_libraries(${PROJECT_NAME} ${GAZEBO_LIBRARIES})
link_directories(${GAZEBO_LIBRARY_DIRS} ../msgs/build/)
target_link_libraries(${PROJECT_NAME} ${GZ_MSGS} ${GAZEBO_LIBRARIES})