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

Merge changes Id7a97940,I6234fe06

Browse Source 
* changes:
  Simulator makefiles: Set file extension based on platform
  Fix CMakeLists.txt to not be platform specific
This commit is contained in:
Brad Miller (WPI)
2014-11-26 09:02:01 -08:00
committed by Gerrit Code Review
parent 020d97580a d7a9794080
commit 486885e8bf
18 changed files with 92 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
simulation/frc_gazebo_plugins/Makefile
View File

@@ -3,6 +3,11 @@ lib.dir = $(prefix)/lib
plugin.dir = $(lib.dir)/frcsim/plugins
build.dir = build
ext = .so
ifeq ($(shell uname), Darwin)
ext = .dylib
endif
.PHONY : all build copy-plugins clean docs clean-docs
all: build copy-plugins
@@ -20,15 +25,15 @@ 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
cp rangefinder/build/libgz_rangefinder.so plugins
cp encoder/build/libgz_encoder.so plugins
cp gyro/build/libgz_gyro.so plugins
cp limit_switch/build/libgz_limit_switch.so plugins
cp clock/build/libgz_clock.so plugins
cp msgs/build/libgz_msgs$(ext) plugins
cp dc_motor/build/libgz_dc_motor$(ext) plugins
cp pneumatic_piston/build/libgz_pneumatic_piston$(ext) plugins
cp potentiometer/build/libgz_potentiometer$(ext) plugins
cp rangefinder/build/libgz_rangefinder$(ext) plugins
cp encoder/build/libgz_encoder$(ext) plugins
cp gyro/build/libgz_gyro$(ext) plugins
cp limit_switch/build/libgz_limit_switch$(ext) plugins
cp clock/build/libgz_clock$(ext) plugins
clean: clean-docs
cd msgs && make clean

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

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

7
simulation/frc_gazebo_plugins/clock/Makefile
View File

@@ -3,6 +3,11 @@ lib.dir = $(prefix)/lib
plugin.dir = $(lib.dir)/frcsim/plugins
build.dir = build
ext = .so
ifeq ($(shell uname), Darwin)
ext = .dylib
endif
all:
mkdir -p $(build.dir)
cd ${build.dir} && cmake .. && make
@@ -12,4 +17,4 @@ clean:
install: all
mkdir -p $(DESTDIR)$(plugin.dir)
install $(build.dir)/libgz_clock.so $(DESTDIR)$(plugin.dir)
install $(build.dir)/libgz_clock$(ext) $(DESTDIR)$(plugin.dir)

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

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

7
simulation/frc_gazebo_plugins/dc_motor/Makefile
View File

@@ -3,6 +3,11 @@ lib.dir = $(prefix)/lib
plugin.dir = $(lib.dir)/frcsim/plugins
build.dir = build
ext = .so
ifeq ($(shell uname), Darwin)
ext = .dylib
endif
all:
mkdir -p $(build.dir)
cd ${build.dir} && cmake .. && make
@@ -12,4 +17,4 @@ clean:
install: all
mkdir -p $(DESTDIR)$(plugin.dir)
install $(build.dir)/libgz_dc_motor.so $(DESTDIR)$(plugin.dir)
install $(build.dir)/libgz_dc_motor$(ext) $(DESTDIR)$(plugin.dir)

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

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

7
simulation/frc_gazebo_plugins/encoder/Makefile
View File

@@ -3,6 +3,11 @@ lib.dir = $(prefix)/lib
plugin.dir = $(lib.dir)/frcsim/plugins
build.dir = build
ext = .so
ifeq ($(shell uname), Darwin)
ext = .dylib
endif
all:
mkdir -p $(build.dir)
cd ${build.dir} && cmake .. && make
@@ -12,4 +17,4 @@ clean:
install: all
mkdir -p $(DESTDIR)$(plugin.dir)
install $(build.dir)/libgz_encoder.so $(DESTDIR)$(plugin.dir)
install $(build.dir)/libgz_encoder$(ext) $(DESTDIR)$(plugin.dir)

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

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

7
simulation/frc_gazebo_plugins/gyro/Makefile
View File

@@ -3,6 +3,11 @@ lib.dir = $(prefix)/lib
plugin.dir = $(lib.dir)/frcsim/plugins
build.dir = build
ext = .so
ifeq ($(shell uname), Darwin)
ext = .dylib
endif
all:
mkdir -p $(build.dir)
cd ${build.dir} && cmake .. && make
@@ -12,4 +17,4 @@ clean:
install: all
mkdir -p $(DESTDIR)$(plugin.dir)
install $(build.dir)/libgz_gyro.so $(DESTDIR)$(plugin.dir)
install $(build.dir)/libgz_gyro$(ext) $(DESTDIR)$(plugin.dir)

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

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

7
simulation/frc_gazebo_plugins/limit_switch/Makefile
View File

@@ -3,6 +3,11 @@ lib.dir = $(prefix)/lib
plugin.dir = $(lib.dir)/frcsim/plugins
build.dir = build
ext = .so
ifeq ($(shell uname), Darwin)
ext = .dylib
endif
all:
mkdir -p $(build.dir)
cd ${build.dir} && cmake .. && make
@@ -12,4 +17,4 @@ clean:
install: all
mkdir -p $(DESTDIR)$(plugin.dir)
install $(build.dir)/libgz_limit_switch.so $(DESTDIR)$(plugin.dir)
install $(build.dir)/libgz_limit_switch$(ext) $(DESTDIR)$(plugin.dir)

7
simulation/frc_gazebo_plugins/msgs/Makefile
View File

@@ -3,6 +3,11 @@ lib.dir = $(prefix)/lib
plugin.dir = $(lib.dir)/frcsim/plugins
build.dir = build
ext = .so
ifeq ($(shell uname), Darwin)
ext = .dylib
endif
all:
mkdir -p $(build.dir)
cd ${build.dir} && cmake .. && make
@@ -12,4 +17,4 @@ clean:
install: all
mkdir -p $(DESTDIR)$(plugin.dir)
install $(build.dir)/libgz_msgs.so $(DESTDIR)$(plugin.dir)
install $(build.dir)/libgz_msgs$(ext) $(DESTDIR)$(plugin.dir)

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

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

7
simulation/frc_gazebo_plugins/pneumatic_piston/Makefile
View File

@@ -3,6 +3,11 @@ lib.dir = $(prefix)/lib
plugin.dir = $(lib.dir)/frcsim/plugins
build.dir = build
ext = .so
ifeq ($(shell uname), Darwin)
ext = .dylib
endif
all:
mkdir -p $(build.dir)
cd ${build.dir} && cmake .. && make
@@ -12,4 +17,4 @@ clean:
install: all
mkdir -p $(DESTDIR)$(plugin.dir)
install $(build.dir)/libgz_pneumatic_piston.so $(DESTDIR)$(plugin.dir)
install $(build.dir)/libgz_pneumatic_piston$(ext) $(DESTDIR)$(plugin.dir)

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

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

7
simulation/frc_gazebo_plugins/potentiometer/Makefile
View File

@@ -3,6 +3,11 @@ lib.dir = $(prefix)/lib
plugin.dir = $(lib.dir)/frcsim/plugins
build.dir = build
ext = .so
ifeq ($(shell uname), Darwin)
ext = .dylib
endif
all:
mkdir -p $(build.dir)
cd ${build.dir} && cmake .. && make
@@ -12,4 +17,4 @@ clean:
install: all
mkdir -p $(DESTDIR)$(plugin.dir)
install $(build.dir)/libgz_potentiometer.so $(DESTDIR)$(plugin.dir)
install $(build.dir)/libgz_potentiometer$(ext) $(DESTDIR)$(plugin.dir)

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

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

7
simulation/frc_gazebo_plugins/rangefinder/Makefile
View File

@@ -3,6 +3,11 @@ lib.dir = $(prefix)/lib
plugin.dir = $(lib.dir)/frcsim/plugins
build.dir = build
ext = .so
ifeq ($(shell uname), Darwin)
ext = .dylib
endif
all:
mkdir -p $(build.dir)
cd ${build.dir} && cmake .. && make
@@ -12,4 +17,4 @@ clean:
install: all
mkdir -p $(DESTDIR)$(plugin.dir)
install $(build.dir)/libgz_rangefinder.so $(DESTDIR)$(plugin.dir)
install $(build.dir)/libgz_rangefinder$(ext) $(DESTDIR)$(plugin.dir)