Skip to content

Commit

Permalink
Revert "Generate messages in downstream builds (#339)"
Browse files Browse the repository at this point in the history
This reverts commit 0c78b96.

Signed-off-by: Michael Carroll <[email protected]>
  • Loading branch information
mjcarroll committed Jul 12, 2023
1 parent 21b1605 commit 85a2b5d
Show file tree
Hide file tree
Showing 72 changed files with 3,120 additions and 4,131 deletions.
21 changes: 8 additions & 13 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,13 @@ find_package(gz-cmake3 REQUIRED)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

gz_configure_project(VERSION_SUFFIX
CONFIG_EXTRAS "gz-msgs-extras.cmake.in")
gz_configure_project(VERSION_SUFFIX)

# Install cmake support files
install(
DIRECTORY cmake/
DESTINATION "lib/cmake/${PROJECT_NAME}"
)
if (UNIX AND NOT APPLE)
set (EXTRA_TEST_LIB_DEPS stdc++fs)
else()
set (EXTRA_TEST_LIB_DEPS)
endif()

#============================================================================
# Set project-specific options
Expand Down Expand Up @@ -72,11 +71,6 @@ gz_find_package(GzProtobuf
COMPONENTS all
PRETTY Protobuf)

#--------------------------------------
# Find gz-utils
gz_find_package(gz-utils2 REQUIRED)
set(GZ_UTILS_VER ${gz-utils2_VERSION_MAJOR})

#--------------------------------------
# Find gz-math
gz_find_package(gz-math7 REQUIRED)
Expand All @@ -96,7 +90,7 @@ gz_find_package(TINYXML2 REQUIRED PRIVATE PRETTY tinyxml2)
#============================================================================
# Configure the build
#============================================================================
gz_configure_build(QUIT_IF_BUILD_ERRORS COMPONENTS compiled)
gz_configure_build(QUIT_IF_BUILD_ERRORS)

#============================================================================
# gz command line support
Expand Down Expand Up @@ -132,6 +126,7 @@ configure_file(${CMAKE_SOURCE_DIR}/tutorials.md.in ${CMAKE_BINARY_DIR}/tutorials
gz_create_docs(
API_MAINPAGE_MD "${CMAKE_BINARY_DIR}/api.md"
TUTORIALS_MAINPAGE_MD "${CMAKE_BINARY_DIR}/tutorials.md"
AUTOGENERATED_DOC "${CMAKE_BINARY_DIR}/include/gz/msgs/details"
TAGFILES
"${GZ-MATH_DOXYGEN_TAGFILE} = ${GZ-MATH_API_URL}"
)
Expand Down
10 changes: 0 additions & 10 deletions Migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,6 @@ Deprecated code produces compile-time warnings. These warning serve as
notification to users that their code should be upgraded. The next major
release will remove the deprecated code.

## Gazebo Msgs 9.X to 10.X

### Breaking changes

1. The way that messages are included by downstream projects has been changed.
The messages package will now only install `.proto` files, and it is the responsibility of downstream
users of the msgs library to generate corresponding headers and source files via cmake macros.
* For more information, consult the `using_gz_msgs` example.
* Note that there will no longer be Ruby generated messages, this support will be restored as-needed.

## Gazebo Msgs 8.X to 9.X

1. **SuppressWarnings.hh** is deprecated and isn't part of `msgs.hh` anymore.
Expand Down
71 changes: 0 additions & 71 deletions cmake/gz_msgs_factory.cmake

This file was deleted.

127 changes: 0 additions & 127 deletions cmake/gz_msgs_generate.cmake

This file was deleted.

108 changes: 0 additions & 108 deletions cmake/gz_msgs_protoc.cmake

This file was deleted.

Loading

0 comments on commit 85a2b5d

Please sign in to comment.