From bd06453cd8cc29b49e8b6df40f5581e2aa3d5116 Mon Sep 17 00:00:00 2001
From: vahrenkamp <vahrenkamp@042f3d55-54a8-47e9-b7fb-15903f145c44>
Date: Mon, 11 Aug 2014 08:39:41 +0000
Subject: [PATCH] fixed urdf lib search
git-svn-id: http://svn.code.sf.net/p/simox/code/trunk@665 042f3d55-54a8-47e9-b7fb-15903f145c44
---
CMakeModules/Findurdfdom.cmake | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/CMakeModules/Findurdfdom.cmake b/CMakeModules/Findurdfdom.cmake
index 3a4f13f1a..7b19653db 100644
--- a/CMakeModules/Findurdfdom.cmake
+++ b/CMakeModules/Findurdfdom.cmake
@@ -3,9 +3,15 @@
SET (URDF_FOUND FALSE)
-FIND_PATH(URDFDOM_INCLUDE_DIRS urdfdom_model/model.h "$ENV{URDFDIR}/include" "$ENV{URDF_DIR}/include")
+FIND_PATH(URDFDOM_INCLUDE_DIRS urdfdom_model/model.h "$ENV{URDFDIR}/include" "$ENV{URDF_DIR}/include" "/usr/include")
+IF (NOT URDFDOM_INCLUDE_DIRS)
+ FIND_PATH(URDFDOM_INCLUDE_DIRS urdf_model/model.h "$ENV{URDFDIR}/include" "$ENV{URDF_DIR}/include" "/usr/include")
+endif()
FIND_PATH(URDFDOM_PARSER_INCLUDE_DIRS urdf_parser/urdf_parser.h "$ENV{URDFDIR}/include" "$ENV{URDF_DIR}/include")
-FIND_LIBRARY(URDFDOM_LIBRARIES urdf "$ENV{URDFDIR}/lib" "$ENV{URDF_DIR}/lib")
+FIND_LIBRARY(URDFDOM_LIBRARIES urdf "$ENV{URDFDIR}/lib" "$ENV{URDF_DIR}/lib" "/usr/lib" "/usr/lib/x86_64-linux-gnu")
+IF (NOT URDFDOM_LIBRARIES)
+ FIND_LIBRARY(URDFDOM_LIBRARIES urdfdom_model "$ENV{URDFDIR}/lib" "$ENV{URDF_DIR}/lib" "/usr/lib" "/usr/lib/x86_64-linux-gnu")
+endif()
IF (URDFDOM_INCLUDE_DIRS AND URDFDOM_PARSER_INCLUDE_DIRS AND URDFDOM_LIBRARIES)
@@ -27,4 +33,4 @@ MARK_AS_ADVANCED (
URDFDOM_PARSER_INCLUDE_DIRS
URDFDOM_LIBRARIES
)
-
\ No newline at end of file
+
--
GitLab