WIP: each module now has its own config.h

Author: jlblancoc

CMakeLists.txt

@@ -518,7 +518,6 @@ else()
     set(EIGEN_MAX_STATIC_ALIGN_BYTES 16)
 endif()
 
-include(${MRPT_SOURCE_DIR}/cmakemodules/script_create_config_h.cmake REQUIRED)   # Build config.h
 include(${MRPT_SOURCE_DIR}/cmakemodules/script_create_version_h.cmake REQUIRED)  # Build version.h
 
 add_custom_target(all_mrpt_libs ALL) # all_mrpt_libs: target to build all mrpt-* modules

cmakemodules/DeclareMRPTLib.cmake

@@ -18,7 +18,6 @@ function(mrpt_lib_target_requires_cpp17 _TARGET)
 
 	# Modern, clean way to do this:
 	target_compile_features(${_TARGET} ${INTERF_TYPE} cxx_std_17)
-
 endfunction()
 
 # Minimize the time and memory required to build and load debug info:
@@ -450,6 +449,21 @@ macro(internal_define_mrpt_lib name headers_only )
 		install(TARGETS ${name} EXPORT mrpt-${name}-targets)
 	endif ()
 
+	# Create module/config.h file
+	# ------------------------------------
+	if (EXISTS ${MRPT_SOURCE_DIR}/libs/${name}/config.h.in)
+		set(MODULES_BASE_CONFIG_INCLUDES_DIR ${CMAKE_BINARY_DIR}/include/mrpt-configuration/)
+		set(MODULE_CONFIG_FILE_INCLUDE_DIR ${MODULES_BASE_CONFIG_INCLUDES_DIR}/mrpt/${name})
+		file(MAKE_DIRECTORY ${MODULE_CONFIG_FILE_INCLUDE_DIR})
+
+		configure_file(${MRPT_SOURCE_DIR}/libs/${name}/config.h.in ${MODULE_CONFIG_FILE_INCLUDE_DIR}/config.h)
+
+		target_include_directories(${name} ${iftype}
+			$<BUILD_INTERFACE:${MODULES_BASE_CONFIG_INCLUDES_DIR}>
+		)
+		install()
+	endif()
+
 	# Create module CMake config file:
 	# For local usage from the BUILD directory (without "install"):
 	# 1/3: autogenerated target file:

cmakemodules/script_create_config_h.cmake

@@ -8,7 +8,7 @@
    +------------------------------------------------------------------------+ */
 #pragma once
 
-#include <mrpt/config.h>
+#include <mrpt/core/config.h>
 #if MRPT_ENABLE_PRECOMPILED_HDRS
 
 #include <mrpt/maps/CMetricMap.h>

libs/apps-cli/src/apps-cli-precomp.h

@@ -8,7 +8,7 @@
    +------------------------------------------------------------------------+ */
 #pragma once
 
-#include <mrpt/config.h>
+#include <mrpt/core/config.h>
 #if MRPT_ENABLE_PRECOMPILED_HDRS
 
 #include <mrpt/maps/CMetricMap.h>

libs/apps-gui/src/apps-gui-precomp.h

@@ -1,3 +1,6 @@
+
+include(${MRPT_SOURCE_DIR}/cmakemodules/script_ftdi.cmake REQUIRED)        # Check for the FTDI headers (Linux only, in win32 we use built-in header & dynamic DLL load):
+
 # extra dependencies required by unit tests in this module:
 set_property(GLOBAL PROPERTY mrpt_comms_UNIT_TEST_EXTRA_DEPS mrpt-poses)
 

libs/comms/CMakeLists.txt

@@ -0,0 +1,19 @@
+/* +---------------------------------------------------------------------------+
+   |                     Mobile Robot Programming Toolkit (MRPT)               |
+   |                          https://www.mrpt.org/                            |
+   |                                                                           |
+   | Copyright (c) 2005-2024, Individual contributors, see AUTHORS file        |
+   | See: https://www.mrpt.org/Authors - All rights reserved.                  |
+   | Released under BSD License. See details in https://www.mrpt.org/License   |
+   +---------------------------------------------------------------------------+
+ */
+
+#pragma once
+
+// clang-format off
+
+/** The file ftdi.h exists (Linux only) */
+#define MRPT_HAS_FTDI             ${CMAKE_MRPT_HAS_FTDI}
+#define MRPT_FTDI_VERSION         0x${LIBFTDI_VERSION_MAJOR}${LIBFTDI_VERSION_MINOR}0
+
+// clang-format on

libs/comms/config.h.in

@@ -8,7 +8,7 @@
    +------------------------------------------------------------------------+ */
 #pragma once
 
-#include <mrpt/config.h>  // MRPT_WORD_SIZE
+#include <mrpt/core/config.h>  // MRPT_WORD_SIZE
 #include <mrpt/io/CStream.h>
 #include <mrpt/system/os.h>
 

libs/comms/include/mrpt/comms/CClientTCPSocket.h

@@ -8,8 +8,8 @@
    +------------------------------------------------------------------------+ */
 #pragma once
 
-#include <mrpt/config.h>
 #include <mrpt/containers/circular_buffer.h>
+#include <mrpt/core/config.h>  // MRPT_OS_LINUX
 #include <mrpt/io/CStream.h>
 
 #include <deque>

libs/comms/include/mrpt/comms/CInterfaceFTDI.h

@@ -7,7 +7,8 @@
    | Released under BSD License. See: https://www.mrpt.org/License          |
    +------------------------------------------------------------------------+ */
 
-#include <mrpt/config.h>
+#include <mrpt/comms/config.h>  // MRPT_HAS_FTDI
+#include <mrpt/core/config.h>   // MRPT_OS_LINUX
 #include <mrpt/core/exceptions.h>
 
 #include <cstring>