Skip to content

Commit 3e4485a

Browse files
committed
Fix: failing unit tests in partial mrpt builds
1 parent 458dd11 commit 3e4485a

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

doc/source/doxygen-docs/changelog.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
\page changelog Change Log
22

33
# Version 2.15.1: UNRELEASED
4-
(NONE)
4+
- Bug fixes:
5+
- FIX: Avoid throw when viewing and describing as text a PCD with an empty field.
6+
- Avoid cmake errors when disabling libraries required by some unit tests.
57

68
# Version 2.15.0: Released Oct 26th, 2025
79
- Changes in apps:

tests/CMakeLists.txt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,20 +101,30 @@ foreach(_TSTLIB ${LST_LIB_TESTS})
101101
# "error adding symbols: DSO missing from command line"
102102
set(lst_deps ${_TSTLIB_DASH} ${lst_deps})
103103
set(link_libs "") # Prepare a list so we can smoothly handle list of libs with "debug", "optimized", etc.
104+
set(missing_deps 0)
104105
foreach(_DEPLIB ${lst_deps})
105106
# Include dirs:
106107
if (_DEPLIB MATCHES "^mrpt-?:*(.*)")
107108
string(REGEX REPLACE "mrpt-?:*(.*)" "\\1" _DEPLIB_DASH ${_DEPLIB})
108109
# This link command automatically imports all required "include directories"
109110
# and other PUBLIC dependencies of the linked target:
110-
list(APPEND link_libs mrpt::${_DEPLIB_DASH})
111+
if (TARGET mrpt::${_DEPLIB_DASH})
112+
list(APPEND link_libs mrpt::${_DEPLIB_DASH})
113+
else()
114+
set(missing_deps 1)
115+
endif()
111116
else()
112117
list(APPEND link_libs ${_DEPLIB})
113118
endif()
114119
endforeach()
115120
target_link_libraries(test_${_TSTLIB} ${link_libs})
116121
unset(link_libs)
117122

123+
if (missing_deps)
124+
message(STATUS "Skipping tests for ${_TSTLIB} due to disabled building dependencies")
125+
continue()
126+
endif()
127+
118128
# Run it:
119129
set(GENERATED_EXE "$<TARGET_FILE:test_${_TSTLIB}>")
120130
# If we are in Emscripten (wasm JavaScript code), run with the node.js interpreter:

0 commit comments

Comments
 (0)