Merged in issue_24_3 (pull request #111)

backport to msgs3: Install ruby files into versioned folder, fixes #24 Approved-by: Jose Luis Rivero <[email protected]> Approved-by: Nate Koenig <[email protected]>
gazebosim · Apr 22, 2019 · 268b08f · 268b08f
2 parents ae0e78f + a92eae4
commit 268b08f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -2,6 +2,11 @@
 
 ### Ignition Msgs 3.x.x
 
+1. Install ruby files into versioned folder
+ * [Pull request 111](https://bitbucket.org/ignitionrobotics/ign-msgs/pull-request/111)
+ * [Issue 24](https://bitbucket.org/ignitionrobotics/ign-msgs/issues/24)
+ * [Issue 27](https://bitbucket.org/ignitionrobotics/ign-msgs/issues/27)
+
 ### Ignition Msgs 3.2.0
 
 1. Added Pose_V, Time, and Clock fields to packet.proto

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -140,8 +140,8 @@ endif()
 set_source_files_properties(${gen_headers} ${gen_sources} ${gen_ruby_scripts}
  PROPERTIES GENERATED TRUE)
 
-message(STATUS "Installing Ruby messages to ${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ruby/ignition/${IGN_DESIGNATION}")
-install(FILES ${gen_ruby_scripts} DESTINATION ${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ruby/ignition/${IGN_DESIGNATION})
+message(STATUS "Installing Ruby messages to ${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ruby/ignition/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}")
+install(FILES ${gen_ruby_scripts} DESTINATION ${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ruby/ignition/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR})
 
 ign_install_includes(
  "${IGN_INCLUDE_INSTALL_DIR_POSTFIX}/ignition/${IGN_DESIGNATION}"