For more information about this bug, visit

peter [dot] soetens [..] ... changed:

What |Removed |Added
---------------------------------------------------------------------------
Target Milestone|--- |0.4.1
Resolution| |FIXED
Status|NEW |RESOLVED

------- Comment #1 from peter [dot] soetens [..] ... 2007-06-01 10:15

$ svn di config/FindComedi.cmake hardware/comedi/CMakeLists.txt
Index: config/FindComedi.cmake
===================================================================
--- config/FindComedi.cmake (revision 28223)
+++ config/FindComedi.cmake (working copy)
@@ -35,7 +35,7 @@
OROCOS_PKGCONFIG_INCPATH("${COMEDI_INCLUDE_DIRS}")
OROCOS_PKGCONFIG_LIBPATH("${COMEDI_INSTALL}/lib")
OROCOS_PKGCONFIG_LIBS("-lcomedi")
- INCLUDE_DIRECTORIES( ${COMEDI_INCLUDE_DIRS} )
+ #INCLUDE_DIRECTORIES( ${COMEDI_INCLUDE_DIRS} )
LINK_DIRECTORIES( ${COMEDI_LINK_DIRS} )
LINK_LIBRARIES( ${COMEDI_LIBS} )
SET(COMEDI_FOUND INTERNAL TRUE)
@@ -51,9 +51,10 @@
#FIND_LIBRARY(COMEDI_LIBRARY NAMES kcomedilxrt PATH
"/usr/realtime/lib")
IF ( COMEDI_INCLUDE_DIR )
# Add comedi header path and lxrt comedi lib
- INCLUDE_DIRECTORIES( ${COMEDI_INSTALL}/include )
+ #INCLUDE_DIRECTORIES( ${COMEDI_INSTALL}/include )
+ SET(COMEDI_INCLUDE_DIRS ${COMEDI_INSTALL}/include )
LINK_LIBRARIES( kcomedilxrt )
- OROCOS_PKGCONFIG_INCPATH("${COMEDI_INSTALL}/include")
+ #OROCOS_PKGCONFIG_INCPATH("${COMEDI_INSTALL}/include")
OROCOS_PKGCONFIG_LIBS("-lkcomedilxrt")
OROCOS_PKGCONFIG_LIBPATH("{COMEDI_INSTALL}/lib")
MESSAGE("linux/comedi.h found.")
Index: hardware/comedi/CMakeLists.txt
===================================================================
--- hardware/comedi/CMakeLists.txt (revision 28223)
+++ hardware/comedi/CMakeLists.txt (working copy)
@@ -13,6 +13,8 @@
GLOBAL_ADD_COMPONENT( orocos-comedi ${DEVSRCS} )
GLOBAL_ADD_INCLUDE( ocl/dev ${DEVHPPS} )

+ SET_TARGET_PROPERTIES( orocos-comedi PROPERTIES COMPILE_FLAGS
"-I${COMEDI_INCLUDE_DIRS}")
+
#ADD_SUBDIRECTORY( tests )

IF( OS_GNULINUX )
sspr@lt00129:~/src/Orocos/trunk/ocl
$ svn ci config/FindComedi.cmake hardware/comedi/CMakeLists.txt -m"Fix bug
#413: comedi/include/linux/version.h include file conflict.
> only add the comedi include path when comedi dev files are compiled.
> "
Sending config/FindComedi.cmake
Sending hardware/comedi/CMakeLists.txt
Transmitting file data ..
Committed revision 28226.

--
(this mail is best viewed with a fixed font)
Configure bugmail: http://www.fmtc.be/orocos-bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
--
Orocos-Dev mailing list
Orocos-Dev [..] ...
http://lists.mech.kuleuven.be/mailman/listinfo/orocos-dev