Fixed backward compatibility (xenial) from #1117

introlab · Sep 5, 2023 · 2d7d0ec · 2d7d0ec
1 parent 191e425
commit 2d7d0ec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -518,10 +518,14 @@ ENDIF(WITH_CVSBA)
 IF(WITH_POINTMATCHER)
     find_package(libpointmatcher QUIET)
     IF(libpointmatcher_FOUND)
-       MESSAGE(STATUS "Found libpointmatcher: ${libpointmatcher_INCLUDE_DIRS}")
-       # Find libnabo:
-       find_package(libnabo REQUIRED PATHS ${LIBNABO_INSTALL_DIR})
-       message(STATUS "libnabo found, version ${libnabo_VERSION} (Config mode)")
+        MESSAGE(STATUS "Found libpointmatcher: ${libpointmatcher_INCLUDE_DIRS}")
+        string(FIND "${libpointmatcher_LIBRARIES}" "libnabo" value)
+        IF(value EQUAL -1)
+            # Find libnabo (Issue #1117):
+            find_package(libnabo REQUIRED PATHS ${LIBNABO_INSTALL_DIR})
+            message(STATUS "libnabo found, version ${libnabo_VERSION} (Config mode)")
+            SET(libpointmatcher_LIBRARIES "${libpointmatcher_LIBRARIES};libnabo::nabo")
+        ENDIF(value EQUAL -1)
     ENDIF(libpointmatcher_FOUND)
 ENDIF(WITH_POINTMATCHER)
 

diff --git a/corelib/src/CMakeLists.txt b/corelib/src/CMakeLists.txt
@@ -457,7 +457,6 @@ IF(libpointmatcher_FOUND)
 	SET(LIBRARIES
 		${LIBRARIES}
 		${libpointmatcher_LIBRARIES}
-		libnabo::nabo
 	)
 ENDIF(libpointmatcher_FOUND)