Skip to content

Commit 5a05a79

Browse files
authored
Merge pull request RoboticaUtnFrba#7 from eborghi10/eborghi/fixes_and_cleanup
Fixes and cleanup
2 parents df15365 + 7c2669b commit 5a05a79

File tree

2 files changed

+15
-56
lines changed

2 files changed

+15
-56
lines changed

Diff for: ca_gazebo/CMakeLists.txt

+15-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
1-
cmake_minimum_required(VERSION 2.8.3)
2-
project(ca_gazebo)
1+
if( ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" )
2+
message( STATUS "Avoid compiling ca_gazebo because of the ARM architecture" )
3+
else()
4+
cmake_minimum_required(VERSION 2.8.3)
5+
project(ca_gazebo)
36

4-
find_package(gazebo REQUIRED)
7+
find_package(gazebo REQUIRED)
58

6-
catkin_package()
9+
catkin_package()
710

8-
include_directories(
9-
${catkin_INCLUDE_DIRS}
10-
)
11+
include_directories(
12+
${catkin_INCLUDE_DIRS}
13+
)
1114

12-
install(DIRECTORY launch worlds
13-
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
15+
install(DIRECTORY launch worlds
16+
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
17+
18+
message(STATUS "ca_gazebo compiled")
19+
endif()

Diff for: ca_node/package.xml~

-47
This file was deleted.

0 commit comments

Comments
 (0)