Skip to content

Commit 87f7551

Browse files
authored
Merge 85a2b5d into 786b42a
2 parents 786b42a + 85a2b5d commit 87f7551

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+3120
-4133
lines changed

CMakeLists.txt

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@ find_package(gz-cmake3 REQUIRED)
1717
set(CMAKE_CXX_STANDARD 17)
1818
set(CMAKE_CXX_STANDARD_REQUIRED ON)
1919

20-
gz_configure_project(VERSION_SUFFIX
21-
CONFIG_EXTRAS "gz-msgs-extras.cmake.in")
20+
gz_configure_project(VERSION_SUFFIX)
2221

23-
# Install cmake support files
24-
install(
25-
DIRECTORY cmake/
26-
DESTINATION "${PROJECT_CMAKE_EXTRAS_INSTALL_DIR}"
27-
)
22+
if (UNIX AND NOT APPLE)
23+
set (EXTRA_TEST_LIB_DEPS stdc++fs)
24+
else()
25+
set (EXTRA_TEST_LIB_DEPS)
26+
endif()
2827

2928
#============================================================================
3029
# Set project-specific options
@@ -72,18 +71,11 @@ gz_find_package(GzProtobuf
7271
COMPONENTS all
7372
PRETTY Protobuf)
7473

75-
#--------------------------------------
76-
# Find gz-utils
77-
gz_find_package(gz-utils2 REQUIRED)
78-
set(GZ_UTILS_VER ${gz-utils2_VERSION_MAJOR})
79-
8074
#--------------------------------------
8175
# Find gz-math
8276
gz_find_package(gz-math7 REQUIRED)
8377
set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR})
8478

85-
find_package(Python3 REQUIRED COMPONENTS Interpreter)
86-
8779
#--------------------------------------
8880
# Find if command is available. This is used to enable tests.
8981
# Note that CLI files are installed regardless of whether the dependency is
@@ -98,7 +90,7 @@ gz_find_package(TINYXML2 REQUIRED PRIVATE PRETTY tinyxml2)
9890
#============================================================================
9991
# Configure the build
10092
#============================================================================
101-
gz_configure_build(QUIT_IF_BUILD_ERRORS COMPONENTS compiled)
93+
gz_configure_build(QUIT_IF_BUILD_ERRORS)
10294

10395
#============================================================================
10496
# gz command line support
@@ -134,6 +126,7 @@ configure_file(${CMAKE_SOURCE_DIR}/tutorials.md.in ${CMAKE_BINARY_DIR}/tutorials
134126
gz_create_docs(
135127
API_MAINPAGE_MD "${CMAKE_BINARY_DIR}/api.md"
136128
TUTORIALS_MAINPAGE_MD "${CMAKE_BINARY_DIR}/tutorials.md"
129+
AUTOGENERATED_DOC "${CMAKE_BINARY_DIR}/include/gz/msgs/details"
137130
TAGFILES
138131
"${GZ-MATH_DOXYGEN_TAGFILE} = ${GZ-MATH_API_URL}"
139132
)

Migration.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,6 @@ Deprecated code produces compile-time warnings. These warning serve as
55
notification to users that their code should be upgraded. The next major
66
release will remove the deprecated code.
77

8-
## Gazebo Msgs 9.X to 10.X
9-
10-
### Breaking changes
11-
12-
1. The way that messages are included by downstream projects has been changed.
13-
The messages package will now only install `.proto` files, and it is the responsibility of downstream
14-
users of the msgs library to generate corresponding headers and source files via cmake macros.
15-
* For more information, consult the `using_gz_msgs` example.
16-
* Note that there will no longer be Ruby generated messages, this support will be restored as-needed.
17-
188
## Gazebo Msgs 8.X to 9.X
199

2010
1. **SuppressWarnings.hh** is deprecated and isn't part of `msgs.hh` anymore.

cmake/gz_msgs_factory.cmake

Lines changed: 0 additions & 71 deletions
This file was deleted.

cmake/gz_msgs_generate.cmake

Lines changed: 0 additions & 127 deletions
This file was deleted.

cmake/gz_msgs_protoc.cmake

Lines changed: 0 additions & 108 deletions
This file was deleted.

0 commit comments

Comments
 (0)