kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

disable FREECAD_USE_EXTERNAL_KDL due to incompatibilities with bundled version

Browse Source
This commit is contained in:
wmayer
2018-08-17 21:59:51 +02:00
parent b848a6a2e2
commit e35f04b4d6
1 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/Mod/Robot/App/CMakeLists.txt
View File

@@ -75,24 +75,30 @@ SET(Robot_SRCS
${Python_SRCS}
)
# FIXME: The bundled KDL has some extensions which makes it incompatible
# to an installed KDL. To fix the issue two things must be done:
# * revert the changes (and look for an alternative)
# * it must be avoided to include headers of the bundled version if the
# installed version is used
#
# use external kdl
if (FREECAD_USE_EXTERNAL_KDL)
find_library(KDL_LIBRARY orocos-kdl)
find_path(KDL_INCLUDES kdl/kdl.hpp)
if(KDL_LIBRARY)
message(STATUS "Found orocos-kdl: ${KDL_LIBRARY}")
endif()
if(KDL_INCLUDES)
message(STATUS "Found orocus_kdl headers: ${KDL_INCLUDES}")
endif()
if(KDL_LIBRARY AND KDL_INCLUDES)
list(APPEND Robot_LIBS ${KDL_LIBRARY})
include_directories(${KDL_INCLUDES})
else()
message(FATAL_ERROR "Using external orocos-kdl was specified but was not found.")
endif()
else(FREECAD_USE_EXTERNAL_KDL)
#if (FREECAD_USE_EXTERNAL_KDL)
# find_library(KDL_LIBRARY orocos-kdl)
# find_path(KDL_INCLUDES kdl/kdl.hpp)
# if(KDL_LIBRARY)
# message(STATUS "Found orocos-kdl: ${KDL_LIBRARY}")
# endif()
# if(KDL_INCLUDES)
# message(STATUS "Found orocus_kdl headers: ${KDL_INCLUDES}")
# endif()
# if(KDL_LIBRARY AND KDL_INCLUDES)
# list(APPEND Robot_LIBS ${KDL_LIBRARY})
# include_directories(${KDL_INCLUDES})
# else()
# message(FATAL_ERROR "Using external orocos-kdl was specified but was not found.")
# endif()
#
#else(FREECAD_USE_EXTERNAL_KDL)
# here we use the internal supplied kdl
add_definitions(-DKDL_USE_NEW_TREE_INTERFACE=1)
FILE( GLOB KDL_SRCS kdl_cp/[^.]*.cpp )
@@ -111,7 +117,7 @@ else(FREECAD_USE_EXTERNAL_KDL)
SOURCE_GROUP("KDL" FILES ${KDL_SRCS} ${KDL_HPPS} ${UTIL_SRCS} ${UTIL_HPPS} )
endif(FREECAD_USE_EXTERNAL_KDL)
#endif(FREECAD_USE_EXTERNAL_KDL)
SOURCE_GROUP("Python" FILES ${Python_SRCS})
SOURCE_GROUP("Module" FILES ${Mod_SRCS})