Revert message generation pipeline (#361)

* Revert "Use cmake extras path variables (#359)" This reverts commit 786b42a. Signed-off-by: Michael Carroll <[email protected]> * Revert "Unconditionally find the python interpreter (#356)" This reverts commit 16de9ef. Signed-off-by: Michael Carroll <[email protected]> * Revert "Generate messages in downstream builds (#339)" This reverts commit 0c78b96. Signed-off-by: Michael Carroll <[email protected]> --------- Signed-off-by: Michael Carroll <[email protected]>
gazebosim · Jul 12, 2023 · 4372e74 · 4372e74
1 parent 786b42a
commit 4372e74
Show file tree

Hide file tree

Showing 72 changed files with 3,120 additions and 4,133 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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 "${PROJECT_CMAKE_EXTRAS_INSTALL_DIR}"
-)
+if (UNIX AND NOT APPLE)
+  set (EXTRA_TEST_LIB_DEPS stdc++fs)
+else()
+  set (EXTRA_TEST_LIB_DEPS)
+endif()
 
 #============================================================================
 # Set project-specific options
@@ -72,18 +71,11 @@ 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)
 set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR})
 
-find_package(Python3 REQUIRED COMPONENTS Interpreter)
-
 #--------------------------------------
 # Find if command is available. This is used to enable tests.
 # Note that CLI files are installed regardless of whether the dependency is
@@ -98,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
@@ -134,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}"
 )

diff --git a/Migration.md b/Migration.md
@@ -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.

diff --git a/cmake/gz_msgs_factory.cmake b/cmake/gz_msgs_factory.cmake
diff --git a/cmake/gz_msgs_generate.cmake b/cmake/gz_msgs_generate.cmake
diff --git a/cmake/gz_msgs_protoc.cmake b/cmake/gz_msgs_protoc.cmake