Imported upstream version '0.1.13' of 'upstream'

ros-naoqi · Sep 7, 2022 · cbbba8f · cbbba8f
1 parent e207561
commit cbbba8f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package nao_meshes
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.1.13 (2022-09-07)
+-------------------
+* Update ERROR_FILE to ERROR_FILE_CMD in CMakeLists to avoid build crash
+* Contributors: mbusy
+
 0.1.12 (2020-01-08)
 -------------------
 * add Maxime Busy as maintainer (`#7 <https://github.com/ros-naoqi/nao_meshes/issues/7>`_)

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -92,11 +92,11 @@ message(STATUS \"ls result: \${RESULT_LS}\")
 
 execute_process(COMMAND file ${TMP_DIR}/installer.run
                 OUTPUT_VARIABLE OUT_FILE
-                ERROR_VARIABLE ERROR_FILE
-                RESULT_VARIABLE RESULT_FILE
+                ERROR_VARIABLE ERROR_FILE_CMD
+                RESULT_VARIABLE ERROR_FILE_CMD
 )
 message(STATUS \"file out: \${OUT_FILE}\")
-message(STATUS \"file error: \${ERROR_FILE}\")
+message(STATUS \"file error: \${ERROR_FILE_CMD}\")
 message(STATUS \"file result: \${RESULT_FILE}\")
 "
 )

diff --git a/package.xml b/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>nao_meshes</name>
-  <version>0.1.12</version>
+  <version>0.1.13</version>
   <description>meshes for the Aldebaran Robotics NAO</description>
   <author email="[email protected]">Vincent Rabaud</author>
   <author email="[email protected]">Mikael Arguedas</author>