config/UseComedi.cmake @@ -20,9 +20,9 @@ IF (OS_GNULINUX OR OS_XENOMAI) MESSAGE("Looking for comedilib headers in ${COMEDI_INSTALL}/include") SET(COMEDILIB_FOUND COMEDILIB_FOUND-NOTFOUND) FIND_FILE("comedilib.h" COMEDILIB_FOUND ${COMEDI_INSTALL}/include) - SET(COMEDI_INCLUDE_DIRS INTERNAL "-I${COMEDI_INSTALL}/include") - SET(COMEDI_LINK_DIRS INTERNAL "-I${COMEDI_INSTALL}/lib") - SET(COMEDI_LIBS INTERNAL "comedilib") + SET(COMEDI_INCLUDE_DIRS "${COMEDI_INSTALL}/include") + SET(COMEDI_LINK_DIRS "${COMEDI_INSTALL}/lib") + SET(COMEDI_LIBS "comedilib") ENDIF ( NOT COMEDILIB_FOUND ) IF( COMEDILIB_FOUND ) @@ -31,15 +31,7 @@ IF (OS_GNULINUX OR OS_XENOMAI) MESSAGE(" Libraries in: '${COMEDI_LINK_DIRS}'") MESSAGE(" Libraries: '${COMEDI_LIBS}'") MESSAGE(" Defines: '${COMEDI_DEFINES}'") - - OROCOS_PKGCONFIG_INCPATH("") - OROCOS_PKGCONFIG_INCPATH("${COMEDI_INCLUDE_DIRS}") - OROCOS_PKGCONFIG_LIBPATH("${COMEDI_INSTALL}/lib") - OROCOS_PKGCONFIG_LIBS( comedi ) - #INCLUDE_DIRECTORIES( ${COMEDI_INCLUDE_DIRS} ) - LINK_DIRECTORIES( ${COMEDI_LINK_DIRS} ) - LINK_LIBRARIES( ${COMEDI_LIBS} ) - SET(COMEDI_FOUND INTERNAL TRUE) + SET(COMEDI_FOUND TRUE) ENDIF( COMEDILIB_FOUND ) ENDIF ( OS_GNULINUX OR OS_XENOMAI ) @@ -49,20 +41,15 @@ ENDIF ( OS_GNULINUX OR OS_XENOMAI ) MESSAGE("Looking for comedi/LXRT headers in ${COMEDI_INSTALL}/include") SET(COMEDI_INCLUDE_DIR COMEDI_INCLUDE_DIR-NOTFOUND) FIND_PATH(COMEDI_INCLUDE_DIR rtai_comedi.h "${COMEDI_INSTALL}/include") - #FIND_LIBRARY(COMEDI_LIBRARY NAMES kcomedilxrt PATH "/usr/realtime/lib") + FIND_LIBRARY(COMEDI_LIBRARY NAMES kcomedilxrt PATH "${COMEDI_INSTALL}/lib") + SET(COMEDI_LINK_DIRS "${COMEDI_INSTALL}/lib" ) IF ( COMEDI_INCLUDE_DIR ) # Add comedi header path and lxrt comedi lib - #INCLUDE_DIRECTORIES( ${COMEDI_INSTALL}/include ) - SET(COMEDI_INCLUDE_DIRS ${COMEDI_INSTALL}/include ) - #LINK_LIBRARIES( kcomedilxrt ) - #OROCOS_PKGCONFIG_INCPATH("${COMEDI_INSTALL}/include") - #OROCOS_PKGCONFIG_LIBS("-lkcomedilxrt") - #OROCOS_PKGCONFIG_LIBPATH("{COMEDI_INSTALL}/lib") + SET(COMEDI_INCLUDE_DIRS "${COMEDI_INSTALL}/include" ) MESSAGE("rtai_comedi.h found.") - SET(COMEDI_FOUND INTERNAL TRUE) + SET(COMEDI_FOUND TRUE) ELSE(COMEDI_INCLUDE_DIR ) MESSAGE("rtai_comedi.h not found.") ENDIF ( COMEDI_INCLUDE_DIR ) - SET(COMEDI_INCLUDE_DIR INTERNAL) ENDIF (OS_LXRT) config/FindComedi.cmake @@ -6,6 +6,8 @@ DEPENDENT_OPTION( BUILD_COMEDI "Build Comedi Component" OFF "BUILD_HARDWARE;COME IF ( BUILD_COMEDI ) + include (${PROJ_SOURCE_DIR}/config/UseComedi.cmake) + # This gathers all the .cpp files into the variable 'SRCS' FILE( GLOB DEVSRCS dev/[^.]*.cpp dev/[^.]*.c ) FILE( GLOB DEVHPPS dev/[^.]*.hpp ) @@ -13,20 +15,4 @@ IF ( BUILD_COMEDI ) GLOBAL_ADD_COMPONENT( orocos-comedi ${DEVSRCS} ) GLOBAL_ADD_INCLUDE( ocl/dev ${DEVHPPS} ) - IF ( COMEDI_INCLUDE_DIRS ) - SET_TARGET_PROPERTIES( orocos-comedi-${OROCOS_TARGET} PROPERTIES COMPILE_FLAGS "-I${COMEDI_INCLUDE_DIRS}") - ENDIF ( COMEDI_INCLUDE_DIRS ) - - #ADD_SUBDIRECTORY( tests ) - - IF( OS_GNULINUX ) - COMPONENT_ADD_LIBS(orocos-comedi comedi) - #OROCOS_PKGCONFIG_LIBS("-lcomedi") - ENDIF( OS_GNULINUX ) - - IF( OS_LXRT ) - COMPONENT_ADD_LIBS(orocos-comedi kcomedilxrt) - #OROCOS_PKGCONFIG_LIBS("-lkcomedilxrt") - ENDIF( OS_LXRT ) - ENDIF ( BUILD_COMEDI ) hardware/comedi/CMakeLists.txt 94e70aa3b0839d65733c3bf4d300dc1e2a209245 psoetens psoetens@ce417995-dfc9-0310-95a0-acdaff106893 http://github.com/doudou/orocos-ocl/commit/00786707c647a6fc5af57ae8c78ed7a456f8c310 00786707c647a6fc5af57ae8c78ed7a456f8c310 2008-10-09T06:48:45-07:00 2008-10-09T06:48:45-07:00 Split FindComedi in FindComedi and UseComedi git-svn-id: https://svn.mech.kuleuven.be/repos/orocos/trunk/ocl@29653 ce417995-dfc9-0310-95a0-acdaff106893 d0cd6ced29a446a8236b7d4023d474621fd45a3e psoetens psoetens@ce417995-dfc9-0310-95a0-acdaff106893