Skip to content
Snippets Groups Projects
Commit 9df0591b authored by adrianamor's avatar adrianamor
Browse files

modified FindKDL: commented find kdltk. >> kdltk

parent c425912a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 22 additions and 22 deletions
FindKDL.cmake
+ 22
− 22
View file @ 9df0591b
......@@ -26,28 +26,28 @@ IF ( CMAKE_PKGCONFIG_EXECUTABLE )
#OROCOS_PKGCONFIG_LIBS("${KDL_LIBS}")
#OROCOS_PKGCONFIG_LIBPATH("${KDL_LINK_DIRS}")
SET(ENV{PKG_CONFIG_PATH} "${KDL_INSTALL}/lib/pkgconfig/:${OROCOS_INSTALL}/lib/pkgconfig")
MESSAGE( "Looking for KDL Toolkit in: ${PKG_CONFIG_PATH}")
PKGCONFIG( "orocos-kdltk-${OROCOS_TARGET} >= 0.99" KDLTK_FOUND KDLTK_INCLUDE_DIRS KDLTK_DEFINES KDLTK_LINK_DIRS KDLTK_LIBS )
IF(KDLTK_FOUND)
INCLUDE_DIRECTORIES( ${KDLTK_INCLUDE_DIRS} )
LINK_DIRECTORIES( ${KDLTK_LINK_DIRS})
OROCOS_PKGCONFIG_INCPATH("${KDLTK_INCLUDE_DIRS}")
OROCOS_PKGCONFIG_LIBPATH("${KDLTK_LINK_DIRS}")
OROCOS_PKGCONFIG_LIBS("${KDLTK_LIBS}")
IF(CORBA_ENABLED)
SET(ENV{PKG_CONFIG_PATH} "${KDL_INSTALL}/lib/pkgconfig/:${OROCOS_INSTALL}/lib/pkgconfig")
MESSAGE("Looking for KDL Toolkit CORBA extension in ${PKG_CONFIG_PATH}")
PKGCONFIG( "orocos-kdltk-corba-${OROCOS_TARGET} >= 0.99" KDLTKCORBA_FOUND KDLTKCORBA_INCLUDE_DIRS KDLTKCORBA_DEFINES KDLTKCORBA_LINK_DIRS KDLTKCORBA_LIBS )
IF(KDLTKCORBA_FOUND)
INCLUDE_DIRECTORIES( ${KDLTKCORBA_INCLUDE_DIRS} )
LINK_DIRECTORIES( ${KDLTKCORBA_LINK_DIRS})
OROCOS_PKGCONFIG_INCPATH("${KDLTKCORBA_INCLUDE_DIRS}")
OROCOS_PKGCONFIG_LIBPATH("${KDLTKCORBA_LINK_DIRS}")
OROCOS_PKGCONFIG_LIBS("${KDLTKCORBA_LIBS}")
ENDIF ( KDLTKCORBA_FOUND )
ENDIF(CORBA_ENABLED)
ENDIF ( KDLTK_FOUND )
# SET(ENV{PKG_CONFIG_PATH} "${KDL_INSTALL}/lib/pkgconfig/:${OROCOS_INSTALL}/lib/pkgconfig")
# MESSAGE( "Looking for KDL Toolkit in: ${PKG_CONFIG_PATH}")
# PKGCONFIG( "orocos-kdltk-${OROCOS_TARGET} >= 0.99" KDLTK_FOUND KDLTK_INCLUDE_DIRS KDLTK_DEFINES KDLTK_LINK_DIRS KDLTK_LIBS )
# IF(KDLTK_FOUND)
# INCLUDE_DIRECTORIES( ${KDLTK_INCLUDE_DIRS} )
# LINK_DIRECTORIES( ${KDLTK_LINK_DIRS})
# OROCOS_PKGCONFIG_INCPATH("${KDLTK_INCLUDE_DIRS}")
# OROCOS_PKGCONFIG_LIBPATH("${KDLTK_LINK_DIRS}")
# OROCOS_PKGCONFIG_LIBS("${KDLTK_LIBS}")
# IF(CORBA_ENABLED)
# SET(ENV{PKG_CONFIG_PATH} "${KDL_INSTALL}/lib/pkgconfig/:${OROCOS_INSTALL}/lib/pkgconfig")
# MESSAGE("Looking for KDL Toolkit CORBA extension in ${PKG_CONFIG_PATH}")
# PKGCONFIG( "orocos-kdltk-corba-${OROCOS_TARGET} >= 0.99" KDLTKCORBA_FOUND KDLTKCORBA_INCLUDE_DIRS KDLTKCORBA_DEFINES KDLTKCORBA_LINK_DIRS KDLTKCORBA_LIBS )
# IF(KDLTKCORBA_FOUND)
# INCLUDE_DIRECTORIES( ${KDLTKCORBA_INCLUDE_DIRS} )
# LINK_DIRECTORIES( ${KDLTKCORBA_LINK_DIRS})
# OROCOS_PKGCONFIG_INCPATH("${KDLTKCORBA_INCLUDE_DIRS}")
# OROCOS_PKGCONFIG_LIBPATH("${KDLTKCORBA_LINK_DIRS}")
# OROCOS_PKGCONFIG_LIBS("${KDLTKCORBA_LIBS}")
# ENDIF ( KDLTKCORBA_FOUND )
# ENDIF(CORBA_ENABLED)
# ENDIF ( KDLTK_FOUND )
ENDIF ( KDL_FOUND )
ELSE ( CMAKE_PKGCONFIG_EXECUTABLE )
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment