Merge branch 'develop'

appveyor.yml

@@ -1,5 +1,5 @@
 # version format
-version: 2.4.8-{branch}-build{build}
+version: 2.4.9-{branch}-build{build}
 
 os: Visual Studio 2019
 

cmakemodules/script_create_version_h.cmake

@@ -4,8 +4,32 @@
 #    TARGET_FILE  ="MRPT_version.h"
 # ----------------------------------------------------------------------------
 set(CMAKE_MRPT_COMPLETE_NAME "MRPT ${CMAKE_MRPT_VERSION_NUMBER_MAJOR}.${CMAKE_MRPT_VERSION_NUMBER_MINOR}.${CMAKE_MRPT_VERSION_NUMBER_PATCH}")
+
+# There is no built-in support for dec to hex in cmake, sigh...
+function(digit_to_hex DIGIT RET)
+  if (NOT ${DIGIT} GREATER 9)
+    set(${RET} ${DIGIT} PARENT_SCOPE)
+  elseif (${DIGIT} MATCHES "10")
+    set(${RET} "A" PARENT_SCOPE)
+  elseif (${DIGIT} MATCHES "11")
+    set(${RET} "B" PARENT_SCOPE)
+  elseif (${DIGIT} MATCHES "12")
+    set(${RET} "C" PARENT_SCOPE)
+  elseif (${DIGIT} MATCHES "13")
+    set(${RET} "D" PARENT_SCOPE)
+  elseif (${DIGIT} MATCHES "14")
+    set(${RET} "E" PARENT_SCOPE)
+  elseif (${DIGIT} MATCHES "15")
+    set(${RET} "F" PARENT_SCOPE)
+  endif()
+endfunction()
+
+digit_to_hex(${CMAKE_MRPT_VERSION_NUMBER_MAJOR} CMAKE_MRPT_VERSION_NUMBER_MAJOR_HEX)
+digit_to_hex(${CMAKE_MRPT_VERSION_NUMBER_MINOR} CMAKE_MRPT_VERSION_NUMBER_MINOR_HEX)
+digit_to_hex(${CMAKE_MRPT_VERSION_NUMBER_PATCH} CMAKE_MRPT_VERSION_NUMBER_PATCH_HEX)
+
 # Build a three digits version code, eg. 0.5.1 -> 051,  1.2.0 -> 120
-set(CMAKE_MRPT_VERSION_CODE "0x${CMAKE_MRPT_VERSION_NUMBER_MAJOR}${CMAKE_MRPT_VERSION_NUMBER_MINOR}${CMAKE_MRPT_VERSION_NUMBER_PATCH}")
+set(CMAKE_MRPT_VERSION_CODE "0x${CMAKE_MRPT_VERSION_NUMBER_MAJOR_HEX}${CMAKE_MRPT_VERSION_NUMBER_MINOR_HEX}${CMAKE_MRPT_VERSION_NUMBER_PATCH_HEX}")
 
 # SOURCE_DATE_EPOCH: See Specs in https://reproducible-builds.org/specs/source-date-epoch/
 # Take its value from:

cmakemodules/script_eigen.cmake

@@ -32,18 +32,20 @@ if (MRPT_EIGEN_USE_EMBEDDED_VERSION)
 		TARGETS Eigen
 		FILE "${MRPT_BINARY_DIR}/ep_eigen3-config.cmake"
 	)
-	install(TARGETS Eigen EXPORT Eigen-targets)
-	if (WIN32)
-    set(dstDir cmake)
-  else()
-    set(dstDir ${this_lib_dev_INSTALL_PREFIX}share/mrpt)
-  endif()
+	install(TARGETS Eigen EXPORT Eigen-targets
+		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+		LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+	)
+
 	install(
 		EXPORT Eigen-targets
-		DESTINATION ${dstDir}
+		DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Eigen
 	)
 	# Dummy ep_eigen3-config.cmake file
-	install(FILES ${MRPT_SOURCE_DIR}/parse-files/ep_eigen3-config.cmake DESTINATION ${dstDir})
+	install(
+		FILES ${MRPT_SOURCE_DIR}/parse-files/ep_eigen3-config.cmake 
+		DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/EP_eigen3)
 
 	target_include_directories(Eigen
 		SYSTEM  # omit warnings for these hdrs

doc/man-pages/CMakeLists.txt

@@ -72,7 +72,6 @@ if (PROG_GZIP AND PROG_POD2MAN)
 	CREATE_MANPAGE_PROJECT(carmen2rawlog)
 	CREATE_MANPAGE_PROJECT(carmen2simplemap)
 	CREATE_MANPAGE_PROJECT(image2gridmap)
-#	CREATE_MANPAGE_PROJECT(rawlog2carmen)
 	CREATE_MANPAGE_PROJECT(ptg-configurator)
 	CREATE_MANPAGE_PROJECT(DifOdometry-Datasets)
 	CREATE_MANPAGE_PROJECT(DifOdometry-Camera)

doc/source/applications.rst

@@ -14,7 +14,6 @@ also provides many ready-to-use applications:
   app_3d-rotation-converter.rst
   app_camera-calib.rst
   page_app_carmen2rawlog.rst
-  page_app_carmen2rawlog.rst
   page_app_carmen2simplemap.rst
   page_app_DifOdometry-Camera.rst
   page_app_DifOdometry-Datasets.rst

doc/source/conf.py

@@ -78,7 +78,10 @@
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+language = 'en'
+
+# Allow Sphinx to find images under the "images" path:
+figure_language_filename='images/{path}/{basename}{ext}'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.