Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Default to Fortress #185

Closed
wants to merge 1 commit into from
Closed

Default to Fortress #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions ros_ign_bridge/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,24 +39,24 @@ elseif("$ENV{IGNITION_VERSION}" STREQUAL "dome")
set(IGN_MSGS_VER ${ignition-msgs6_VERSION_MAJOR})

message(STATUS "Compiling against Ignition Dome")
# Fortress
# Edifice
elseif("$ENV{IGNITION_VERSION}" STREQUAL "fortress")
find_package(ignition-transport11 REQUIRED)
set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})

find_package(ignition-msgs8 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs8_VERSION_MAJOR})

message(STATUS "Compiling against Ignition Fortress")
# Default to Edifice
else()
find_package(ignition-transport10 REQUIRED)
set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})

find_package(ignition-msgs7 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs7_VERSION_MAJOR})

message(STATUS "Compiling against Ignition Edifice")
# Default to Fortress
else()
find_package(ignition-transport11 REQUIRED)
set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})

find_package(ignition-msgs8 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs8_VERSION_MAJOR})

message(STATUS "Compiling against Ignition Fortress")
endif()

include_directories(include)
Expand Down
4 changes: 2 additions & 2 deletions ros_ign_bridge/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<!-- Edifice (default) -->
<depend condition="$IGNITION_VERSION == edifice">ignition-msgs7</depend>
<depend condition="$IGNITION_VERSION == edifice">ignition-transport10</depend>
<depend condition="$IGNITION_VERSION == ''">ignition-msgs7</depend>
<depend condition="$IGNITION_VERSION == ''">ignition-transport10</depend>
<depend condition="$IGNITION_VERSION == ''">ignition-msgs8</depend>
<depend condition="$IGNITION_VERSION == ''">ignition-transport11</depend>
<!-- Dome -->
<depend condition="$IGNITION_VERSION == dome">ignition-msgs6</depend>
<depend condition="$IGNITION_VERSION == dome">ignition-transport9</depend>
Expand Down
20 changes: 10 additions & 10 deletions ros_ign_gazebo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,24 +32,24 @@ elseif("$ENV{IGNITION_VERSION}" STREQUAL "dome")
set(IGN_MSGS_VER ${ignition-msgs6_VERSION_MAJOR})

message(STATUS "Compiling against Ignition Dome")
# Fortress
# Edifice
elseif("$ENV{IGNITION_VERSION}" STREQUAL "fortress")
find_package(ignition-transport11 REQUIRED)
set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})

find_package(ignition-msgs8 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs8_VERSION_MAJOR})

message(STATUS "Compiling against Ignition Fortress")
# Default to Edifice
else()
find_package(ignition-transport10 REQUIRED)
set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})

find_package(ignition-msgs7 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs7_VERSION_MAJOR})

message(STATUS "Compiling against Ignition Edifice")
# Default to Fortress
else()
find_package(ignition-transport11 REQUIRED)
set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})

find_package(ignition-msgs8 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs8_VERSION_MAJOR})

message(STATUS "Compiling against Ignition Fortress")
endif()

ign_find_package(gflags
Expand Down
2 changes: 1 addition & 1 deletion ros_ign_gazebo/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<depend condition="$IGNITION_VERSION == fortress">ignition-gazebo6</depend>
<!-- Edifice (default) -->
<depend condition="$IGNITION_VERSION == edifice">ignition-gazebo5</depend>
<depend condition="$IGNITION_VERSION == ''">ignition-gazebo5</depend>
<depend condition="$IGNITION_VERSION == ''">ignition-gazebo6</depend>
<!-- Dome -->
<depend condition="$IGNITION_VERSION == dome">ignition-gazebo4</depend>
<!-- Citadel -->
Expand Down
20 changes: 10 additions & 10 deletions ros_ign_image/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,24 @@ elseif("$ENV{IGNITION_VERSION}" STREQUAL "dome")
set(IGN_MSGS_VER ${ignition-msgs6_VERSION_MAJOR})

message(STATUS "Compiling against Ignition Dome")
# Fortress
# Edifice
elseif("$ENV{IGNITION_VERSION}" STREQUAL "fortress")
find_package(ignition-transport11 REQUIRED)
set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})

find_package(ignition-msgs8 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs8_VERSION_MAJOR})

message(STATUS "Compiling against Ignition Fortress")
# Default to Edifice
else()
find_package(ignition-transport10 REQUIRED)
set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})

find_package(ignition-msgs7 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs7_VERSION_MAJOR})

message(STATUS "Compiling against Ignition Edifice")
# Default to Fortress
else()
find_package(ignition-transport11 REQUIRED)
set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})

find_package(ignition-msgs8 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs8_VERSION_MAJOR})

message(STATUS "Compiling against Ignition Fortress")
endif()

include_directories(include)
Expand Down
4 changes: 2 additions & 2 deletions ros_ign_image/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<!-- Edifice (default) -->
<depend condition="$IGNITION_VERSION == edifice">ignition-msgs7</depend>
<depend condition="$IGNITION_VERSION == edifice">ignition-transport10</depend>
<depend condition="$IGNITION_VERSION == ''">ignition-msgs7</depend>
<depend condition="$IGNITION_VERSION == ''">ignition-transport10</depend>
<depend condition="$IGNITION_VERSION == ''">ignition-msgs8</depend>
<depend condition="$IGNITION_VERSION == ''">ignition-transport11</depend>
<!-- Dome -->
<depend condition="$IGNITION_VERSION == dome">ignition-msgs6</depend>
<depend condition="$IGNITION_VERSION == dome">ignition-transport9</depend>
Expand Down