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

Fixed cmake warning on ros build farm, bumped version to 1.4.1 #105

Merged
merged 1 commit into from
Nov 24, 2023
Merged

Fixed cmake warning on ros build farm, bumped version to 1.4.1 #105

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
4 changes: 4 additions & 0 deletions flatland/CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ Change Log

This project adheres to `Semantic Versioning <http://semver.org/>`_.

1.4.1 (2023-11-24)
------------------
* CMake version required bump to fix ros build farm warning

1.4.0 (2023-11-22)
------------------
* Version Bump
Expand Down
2 changes: 1 addition & 1 deletion flatland/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0.2)
project(flatland)
find_package(catkin REQUIRED)
catkin_metapackage()
2 changes: 1 addition & 1 deletion flatland/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<package>
<name>flatland</name>
<version>1.4.0</version>
<version>1.4.1</version>
<description>
This is the metapackage for flatland.
</description>
Expand Down
5 changes: 5 additions & 0 deletions flatland_msgs/CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Changelog for package flatland_msgs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1.4.1 (2023-11-24)
------------------
* CMake version required bump to fix ros build farm warning


1.4.0 (2023-11-22)
------------------
* Version Bump
Expand Down
2 changes: 1 addition & 1 deletion flatland_msgs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0.2)
project(flatland_msgs)

# Ensure we're using c++11
Expand Down
2 changes: 1 addition & 1 deletion flatland_msgs/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>flatland_msgs</name>
<version>1.4.0</version>
<version>1.4.1</version>
<description>The flatland_msgs package</description>
<license>BSD</license>
<url type="website">https://bitbucket.org/avidbots/flatland</url>
Expand Down
4 changes: 4 additions & 0 deletions flatland_plugins/CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
Changelog for package flatland_plugins
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1.4.1 (2023-11-24)
------------------
* CMake version required bump to fix ros build farm warning

1.4.0 (2023-11-22)
------------------
* Merge pull request `#103 <https://github.com/avidbots/flatland/pull/103>`_ adding
Expand Down
2 changes: 1 addition & 1 deletion flatland_plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0.2)
project(flatland_plugins)

# Ensure we're using c++11
Expand Down
2 changes: 1 addition & 1 deletion flatland_plugins/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>flatland_plugins</name>
<version>1.4.0</version>
<version>1.4.1</version>
<description>Default plugins for flatland</description>
<license>BSD</license>
<url type="website">https://bitbucket.org/avidbots/flatland</url>
Expand Down
4 changes: 4 additions & 0 deletions flatland_server/CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
Changelog for package flatland_server
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1.4.1 (2023-11-24)
------------------
* CMake version required bump to fix ros build farm warning

1.4.0 (2023-11-22)
------------------
* Version Bump
Expand Down
8 changes: 5 additions & 3 deletions flatland_server/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0.2)
project(flatland_server)

# Ensure we're using c++11
Expand Down Expand Up @@ -42,8 +42,8 @@ find_package(Lua 5.1 QUIET)
find_package(OpenCV REQUIRED)

# Boost
find_package(Boost REQUIRED COMPONENTS date_time system thread filesystem)
find_package(Threads)
find_package(Boost REQUIRED COMPONENTS date_time system filesystem)
find_package(Threads REQUIRED)

##############
## coverage ##
Expand Down Expand Up @@ -113,6 +113,7 @@ target_link_libraries(flatland_lib
${OpenCV_LIBRARIES}
${Boost_LIBRARIES}
${LUA_LIBRARIES}
Threads::Threads
flatland_Box2D
yaml-cpp
)
Expand All @@ -132,6 +133,7 @@ target_link_libraries(flatland_server
${OpenCV_LIBRARIES}
${Boost_LIBRARIES}
${LUA_LIBRARIES}
Threads::Threads
flatland_Box2D
yaml-cpp
flatland_lib
Expand Down
2 changes: 1 addition & 1 deletion flatland_server/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>flatland_server</name>
<version>1.4.0</version>
<version>1.4.1</version>
<description>The flatland_server package</description>
<license>BSD</license>
<url type="website">https://bitbucket.org/avidbots/flatland</url>
Expand Down
4 changes: 4 additions & 0 deletions flatland_viz/CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
Changelog for package flatland_viz
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1.4.1 (2023-11-24)
------------------
* CMake version required bump to fix ros build farm warning

1.4.0 (2023-11-22)
------------------
* Version Bump
Expand Down
2 changes: 1 addition & 1 deletion flatland_viz/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0.2)
project(flatland_viz)

# Get the LSB release name (14.04 or 16.04) string into variable ${LSB_RELEASE_VALUE}
Expand Down
2 changes: 1 addition & 1 deletion flatland_viz/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>flatland_viz</name>
<version>1.4.0</version>
<version>1.4.1</version>
<description>The flatland gui and visualization</description>
<license>BSD</license>
<url type="website">https://bitbucket.org/avidbots/flatland</url>
Expand Down