Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 4 additions & 20 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,11 @@ endif()
# CMake cache variable:
# > cmake -GZ_MSGS_GEN_EXECUTABLE=<host_install_prefix>/bin/gz_msgs_gen ..

# TODO(CH3): Deprecated. Remove IGN_MSGS CMake variables on tick-tock.
if(INSTALL_IGN_MSGS_GEN_EXECUTABLE)
message(WARNING "INSTALL_IGN_MSGS_GEN_EXECUTABLE is deprecated, use INSTALL_GZ_MSGS_GEN_EXECUTABLE instead")
set(INSTALL_GZ_MSGS_GEN_EXECUTABLE ${INSTALL_IGN_MSGS_GEN_EXECUTABLE})
else()
option(
INSTALL_GZ_MSGS_GEN_EXECUTABLE
"Install the gz_msgs_gen executable."
OFF)
set(INSTALL_IGN_MSGS_GEN_EXECUTABLE ${INSTALL_GZ_MSGS_GEN_EXECUTABLE})
endif()
option(
INSTALL_GZ_MSGS_GEN_EXECUTABLE
"Install the gz_msgs_gen executable."
OFF)

mark_as_advanced(INSTALL_IGN_MSGS_GEN_EXECUTABLE)
mark_as_advanced(INSTALL_GZ_MSGS_GEN_EXECUTABLE)

set(
Expand All @@ -67,14 +59,6 @@ set(
"gz_msgs_gen executable used in the gz_msgs_protoc CMake function.")
mark_as_advanced(GZ_MSGS_GEN_EXECUTABLE)

# TODO(CH3): Deprecated. Remove IGN_MSGS CMake variables on tick-tock.
set(
IGN_MSGS_GEN_EXECUTABLE
"$<TARGET_FILE:gz_msgs_gen>"
CACHE STRING
"gz_msgs_gen executable used in the gz_msgs_protoc CMake function.")
mark_as_advanced(IGN_MSGS_GEN_EXECUTABLE)

#============================================================================
# Search for project-specific dependencies
#============================================================================
Expand Down
1 change: 0 additions & 1 deletion include/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
add_subdirectory(gz)
install(DIRECTORY ignition DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL})
19 changes: 0 additions & 19 deletions include/ignition/msgs.hh

This file was deleted.

19 changes: 0 additions & 19 deletions include/ignition/msgs/Export.hh

This file was deleted.

22 changes: 0 additions & 22 deletions include/ignition/msgs/Factory.hh

This file was deleted.

19 changes: 0 additions & 19 deletions include/ignition/msgs/Filesystem.hh

This file was deleted.

19 changes: 0 additions & 19 deletions include/ignition/msgs/MessageTypes.hh

This file was deleted.

19 changes: 0 additions & 19 deletions include/ignition/msgs/PointCloudPackedUtils.hh

This file was deleted.

71 changes: 0 additions & 71 deletions include/ignition/msgs/SuppressWarning.hh

This file was deleted.

19 changes: 0 additions & 19 deletions include/ignition/msgs/Utility.hh

This file was deleted.

46 changes: 0 additions & 46 deletions include/ignition/msgs/config.hh

This file was deleted.

13 changes: 1 addition & 12 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,7 @@ function(gz_msgs_protoc)
set(output_header "${gz_msgs_protoc_OUTPUT_CPP_DIR}${proto_package_dir}/${FIL_WE}.pb.h")
# Full path to generated detail header (${PROJECT_BINARY_DIR}/include/gz/msgs/details/foo.pb.h)
set(output_detail_header "${gz_msgs_protoc_OUTPUT_CPP_DIR}${proto_package_dir}/details/${FIL_WE}.pb.h")
# Full path to generated ignition header (${PROJECT_BINARY_DIR}/include/ignition/msgs/foo.pb.h)
set(output_ign_header "${gz_msgs_protoc_OUTPUT_CPP_DIR}/ignition/msgs/${FIL_WE}.pb.h")
# Full path to generated ignition header (${PROJECT_BINARY_DIR}/include/foo.pb.cc)
# Full path to generated source (${PROJECT_BINARY_DIR}/include/foo.pb.cc)
set(output_source "${gz_msgs_protoc_OUTPUT_CPP_DIR}${proto_package_dir}/${FIL_WE}.pb.cc")

# Generate a clean relative path (gz/msgs/foo.pb.h)
Expand Down Expand Up @@ -116,7 +114,6 @@ function(gz_msgs_protoc)
--gz-generator-bin "${GZ_MSGS_GEN_EXECUTABLE}"
--generate-cpp "${gz_msgs_protoc_GENERATE_CPP}"
--generate-ruby "${gz_msgs_protoc_GENERATE_RUBY}"
--generate-ignition "TRUE"
--output-cpp-path "${gz_msgs_protoc_OUTPUT_CPP_DIR}"
--output-ruby-path "${gz_msgs_protoc_OUTPUT_RUBY_DIR}"
--proto-path "${gz_msgs_protoc_PROTO_PATH}"
Expand Down Expand Up @@ -187,9 +184,6 @@ endif()
set_source_files_properties(${gen_headers} ${gen_ign_headers} ${gen_detail_headers} ${gen_sources} ${gen_ruby_scripts}
PROPERTIES GENERATED TRUE)

message(STATUS "Installing Ruby messages to ${CMAKE_INSTALL_PREFIX}/${GZ_LIB_INSTALL_DIR}/ruby/ignition/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}")
install(FILES ${gen_ruby_scripts} DESTINATION ${CMAKE_INSTALL_PREFIX}/${GZ_LIB_INSTALL_DIR}/ruby/ignition/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR})

message(STATUS "Installing Ruby messages to ${CMAKE_INSTALL_PREFIX}/${GZ_LIB_INSTALL_DIR}/ruby/gz/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}")
install(FILES ${gen_ruby_scripts} DESTINATION ${CMAKE_INSTALL_PREFIX}/${GZ_LIB_INSTALL_DIR}/ruby/gz/${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR})

Expand All @@ -203,11 +197,6 @@ gz_install_includes(
"${GZ_INCLUDE_INSTALL_DIR_POSTFIX}/gz/${IGN_DESIGNATION}/details"
${gen_detail_headers})

# Install ignition/msgs
gz_install_includes(
"${GZ_INCLUDE_INSTALL_DIR_POSTFIX}/ignition/msgs"
${gen_ign_headers})

##################################################
# Generate gz/msgs/MessageTypes.hh
foreach (hdr ${gen_includes})
Expand Down
33 changes: 0 additions & 33 deletions test/integration/deprecated_TEST.cc

This file was deleted.

Loading