Fix mrpt_common basic module

Author: jlblancoc

CMakeLists.txt renamed to CMakeLists.txt.old

@@ -1,5 +1,5 @@
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Changelog for package mola_common
+Changelog for package mrpt_common
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 0.4.0 (2024-08-20)

CMakeSettings.json

@@ -1,6 +1,6 @@
 # ------------------------------------------------------------------------------
 #        A Modular Optimization framework for Localization and mApping
-#                               (MOLA)
+#                               (MRPT)
 #
 # Copyright (C) 2018-2025, Jose Luis Blanco-Claraco, contributors (AUTHORS.md)
 # All rights reserved.
@@ -19,23 +19,40 @@ elseif("$ENV{ROS_VERSION}" STREQUAL "1")
 	set(CMAKE_CXX_STANDARD 14)
 endif()
 
-project(mola_common)
+project(mrpt_common)
 
 include(GNUInstallDirs) # for install dirs in multilib
 include(CMakePackageConfigHelpers)
 
 # Instrumental lib:
 add_library(${PROJECT_NAME} INTERFACE)
 
-# Project version:
-include(mola-version.cmake)
+#----
+# Extract version from package.xml
+# Example line:" <version>0.3.2</version>"
+file(READ package.xml contentPackageXML)
+string(REGEX MATCH "<version>([0-9\.]*)</version>" _ ${contentPackageXML})
+set(MRPT_VERSION ${CMAKE_MATCH_1})
+message(STATUS "MRPT version: ${MRPT_VERSION} (detected in package.xml)")
+unset(contentPackageXML)
+string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" _ ${MRPT_VERSION})
+set(MRPT_MAJOR_VERSION ${CMAKE_MATCH_1})
+set(MRPT_MINOR_VERSION ${CMAKE_MATCH_2})
+set(MRPT_PATCH_VERSION ${CMAKE_MATCH_3})
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/mrpt_common-version.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/mrpt_common-version.cmake
+    @ONLY
+)
+#----
+
 
 # Allow build-time finding of this package:
-set(mola_common_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "Path to mola_common")
+set(mrpt_common_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "Path to mrpt_common")
 
 # not ament-based builds (standalone, w/o ROS):
 if ((NOT DETECTED_ROS2) AND (NOT DETECTED_ROS1))
-	# Generate: mola_common-version.cmake
+	# Generate: mrpt_common-version.cmake
 	include(CMakePackageConfigHelpers)
 
 	if(NOT ${CMAKE_VERSION} VERSION_LESS "3.14.0")
@@ -44,18 +61,18 @@ if ((NOT DETECTED_ROS2) AND (NOT DETECTED_ROS1))
 
 	write_basic_package_version_file(
 		# generate to the topmost root binary dir:
-		${CMAKE_BINARY_DIR}/mola_common-config-version.cmake
-		VERSION ${MOLA_VERSION_NUMBER_MAJOR}.${MOLA_VERSION_NUMBER_MINOR}.${MOLA_VERSION_NUMBER_PATCH}
+		${CMAKE_BINARY_DIR}/mrpt_common-config-version.cmake
+		VERSION ${MRPT_MAJOR_VERSION}.${MRPT_MINOR_VERSION}.${MRPT_PATCH_VERSION}
 		COMPATIBILITY AnyNewerVersion
 		${ARCH_INDEP_FLAG}
 	)
 
-	# Generate: mola_common.cmake
+	# Generate: mrpt_common.cmake
 	configure_file(
 		# Input:
-		mola_common-config.cmake.in
+		mrpt_common-config.cmake.in
 		# Output: generate to the topmost root binary dir:
-		${CMAKE_BINARY_DIR}/mola_common-config.cmake
+		${CMAKE_BINARY_DIR}/mrpt_common-config.cmake
 		# Parse: "@var_names@" only
 		@ONLY
 	)
@@ -65,7 +82,7 @@ if ((NOT DETECTED_ROS2) AND (NOT DETECTED_ROS1))
 		FILES
 			${CMAKE_BINARY_DIR}/${PROJECT_NAME}-config.cmake
 			${CMAKE_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake
-			${CMAKE_SOURCE_DIR}/mola-version.cmake
+			${CMAKE_BINARY_DIR}/mrpt_common-version.cmake
 			DESTINATION
 				share/${PROJECT_NAME}/cmake
 	)
@@ -90,8 +107,8 @@ set(CUSTOM_CMAKE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 # Install files common to both, ROS and non-ROS builds:
 install(
 	FILES
-		${CUSTOM_CMAKE_DIR}/mola_cmake_functions.cmake
-		${CUSTOM_CMAKE_DIR}/mola-xxx-config.cmake.in
+		${CUSTOM_CMAKE_DIR}/mrpt_cmake_functions.cmake
+		${CUSTOM_CMAKE_DIR}/mrpt-xxx-config.cmake.in
 		DESTINATION
 			share/${PROJECT_NAME}/cmake
 )
@@ -106,7 +123,7 @@ if (DETECTED_ROS1)
 
 	# Declare this project as a catkin package
 	catkin_package(
-		CFG_EXTRAS mola_cmake_functions.cmake
+		CFG_EXTRAS mrpt_cmake_functions.cmake
 	)
 endif()
 
@@ -121,10 +138,10 @@ if (DETECTED_ROS2)
 	#  rclcpp...
 	#)
 
-	# Add custom mola cmake macros, as in our non-ament (ROS2) config.cmake file:
-	# See: mola_common-config.cmake.in
+	# Add custom mrpt cmake macros, as in our non-ament (ROS2) config.cmake file:
+	# See: mrpt_common-config.cmake.in
 
 	ament_package(
-		CONFIG_EXTRAS cmake/mola_cmake_functions.cmake
+		CONFIG_EXTRAS cmake/mrpt_cmake_functions.cmake
 	)
 endif()

modules/CMakeLists.txt renamed to modules/CMakeLists.txt.old

@@ -1,18 +1,18 @@
 include(CMakeFindDependencyMacro)
 
 # Hints to help CMake finding my dependencies (and theirs own), as well as
-# other future calls to search for other mola modules from our parent scope:
-# 1: MOLA_DIR cmake var:
-if (NOT "${MOLA_DIR}" STREQUAL "")
-  list(APPEND CMAKE_PREFIX_PATH "${MOLA_DIR}")
-  # If the user defines MOLA_DIR, that path overrides whatever CMake on its own
+# other future calls to search for other mrpt modules from our parent scope:
+# 1: MRPT_DIR cmake var:
+if (NOT "${MRPT_DIR}" STREQUAL "")
+  list(APPEND CMAKE_PREFIX_PATH "${MRPT_DIR}")
+  # If the user defines MRPT_DIR, that path overrides whatever CMake on its own
   # found (this file):
   get_filename_component(this_dir "${CMAKE_CURRENT_LIST_DIR}" ABSOLUTE)
-  get_filename_component(user_mola_dir "${MOLA_DIR}" ABSOLUTE)
-  if ((EXISTS "${MOLA_DIR}/@MOLA_MODULE_NAME@-config.cmake") AND (NOT "${this_dir}" STREQUAL "${user_mola_dir}"))
-    message("@MOLA_MODULE_NAME@_DIR was: ${@MOLA_MODULE_NAME@_DIR}")
-    set(@MOLA_MODULE_NAME@_DIR "${MOLA_DIR}" CACHE PATH "Path to @MOLA_MODULE_NAME@" FORCE)
-    include(${MOLA_DIR}/@MOLA_MODULE_NAME@-config.cmake)
+  get_filename_component(user_mrpt_dir "${MRPT_DIR}" ABSOLUTE)
+  if ((EXISTS "${MRPT_DIR}/@MRPT_MODULE_NAME@-config.cmake") AND (NOT "${this_dir}" STREQUAL "${user_mrpt_dir}"))
+    message("@MRPT_MODULE_NAME@_DIR was: ${@MRPT_MODULE_NAME@_DIR}")
+    set(@MRPT_MODULE_NAME@_DIR "${MRPT_DIR}" CACHE PATH "Path to @MRPT_MODULE_NAME@" FORCE)
+    include(${MRPT_DIR}/@MRPT_MODULE_NAME@-config.cmake)
     return()
   endif()
 endif()
@@ -32,4 +32,4 @@ endforeach()
 @EXTRA_CONFIG_CMDS@
 
 # Include targets for this library:
-include(${CMAKE_CURRENT_LIST_DIR}/@MOLA_MODULE_NAME@-targets.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/@MRPT_MODULE_NAME@-targets.cmake)