suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Path: Removed KDL/Robot dependency

Browse Source
This commit is contained in:
Yorik van Havre 2015-10-13 16:44:09 -03:00
parent 60ac7e4cb8
commit e4ac34ecb0
4 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -292,7 +292,7 @@ endif(BUILD_ROBOT)
#path module dependencies. #path module dependencies.
if(BUILD_PATH) if(BUILD_PATH)
set(BUILD_PART ON) set(BUILD_PART ON)
set(BUILD_ROBOT ON) #set(BUILD_ROBOT ON) reenable this when using KDL
endif(BUILD_PATH) endif(BUILD_PATH)
#inferred from cmakelists.txt. appears to be working. #inferred from cmakelists.txt. appears to be working.

41
src/Mod/Path/App/CMakeLists.txt
View File

@ -73,27 +73,26 @@ SET(Path_SRCS
SOURCE_GROUP("Python" FILES ${Python_SRCS}) SOURCE_GROUP("Python" FILES ${Python_SRCS})
SOURCE_GROUP("Module" FILES ${Mod_SRCS}) SOURCE_GROUP("Module" FILES ${Mod_SRCS})
if (WIN32) #if (WIN32) uncomment to use KDL
add_definitions(-DEIGEN2_SUPPORT) # FILE( GLOB KDL_SRCS ${CMAKE_SOURCE_DIR}/src/Mod/Robot/App/kdl_cp/[^.]*.cpp )
FILE( GLOB KDL_SRCS ${CMAKE_SOURCE_DIR}/src/Mod/Robot/App/kdl_cp/[^.]*.cpp ) # FILE( GLOB KDL_HPPS ${CMAKE_SOURCE_DIR}/src/Mod/Robot/App/kdl_cp/[^.]*.hpp
FILE( GLOB KDL_HPPS ${CMAKE_SOURCE_DIR}/src/Mod/Robot/App/kdl_cp/[^.]*.hpp # ${CMAKE_SOURCE_DIR}/src/Mod/Robot/App/kdl_cp/[^.]*.inl)
${CMAKE_SOURCE_DIR}/src/Mod/Robot/App/kdl_cp/[^.]*.inl) #
# FILE( GLOB UTIL_SRCS ${CMAKE_SOURCE_DIR}/src/Mod/Robot/App/kdl_cp/utilities/[^.]*.cpp
FILE( GLOB UTIL_SRCS ${CMAKE_SOURCE_DIR}/src/Mod/Robot/App/kdl_cp/utilities/[^.]*.cpp # ${CMAKE_SOURCE_DIR}/src/Mod/Robot/App/kdl_cp/utilities/[^.]*.cxx)
${CMAKE_SOURCE_DIR}/src/Mod/Robot/App/kdl_cp/utilities/[^.]*.cxx) # FILE( GLOB UTIL_HPPS ${CMAKE_SOURCE_DIR}/src/Mod/Robot/App/kdl_cp/utilities/[^.]*.h
FILE( GLOB UTIL_HPPS ${CMAKE_SOURCE_DIR}/src/Mod/Robot/App/kdl_cp/utilities/[^.]*.h # ${CMAKE_SOURCE_DIR}/src/Mod/Robot/App/kdl_cp/utilities/[^.]*.hpp)
${CMAKE_SOURCE_DIR}/src/Mod/Robot/App/kdl_cp/utilities/[^.]*.hpp) #
# SET(Path_SRCS
SET(Path_SRCS # ${Path_SRCS}
${Path_SRCS} # ${KDL_SRCS}
${KDL_SRCS} # ${KDL_HPPS}
${KDL_HPPS} # ${UTIL_SRCS}
${UTIL_SRCS} # ${UTIL_HPPS}
${UTIL_HPPS} # )
) #
# SOURCE_GROUP("KDL" FILES ${KDL_SRCS} ${KDL_HPPS} ${UTIL_SRCS} ${UTIL_HPPS} )
SOURCE_GROUP("KDL" FILES ${KDL_SRCS} ${KDL_HPPS} ${UTIL_SRCS} ${UTIL_HPPS} ) #endif(WIN32)
endif(WIN32)
SET(Path_Scripts SET(Path_Scripts
Init.py Init.py

9
src/Mod/Path/App/Path.cpp
View File

@ -34,10 +34,11 @@
#include <Base/Stream.h> #include <Base/Stream.h>
#include <Base/Exception.h> #include <Base/Exception.h>
#include "Mod/Robot/App/kdl_cp/path_line.hpp" // KDL stuff - at the moment, not used
#include "Mod/Robot/App/kdl_cp/path_circle.hpp" //#include "Mod/Robot/App/kdl_cp/path_line.hpp"
#include "Mod/Robot/App/kdl_cp/rotational_interpolation_sa.hpp" //#include "Mod/Robot/App/kdl_cp/path_circle.hpp"
#include "Mod/Robot/App/kdl_cp/utilities/error.h" //#include "Mod/Robot/App/kdl_cp/rotational_interpolation_sa.hpp"
//#include "Mod/Robot/App/kdl_cp/utilities/error.h"
#include "Path.h" #include "Path.h"

4
src/Mod/Path/App/PreCompiled.h
View File

@ -29,12 +29,12 @@
// Exporting of App classes // Exporting of App classes
#ifdef FC_OS_WIN32 #ifdef FC_OS_WIN32
# define PathExport __declspec(dllexport) # define PathExport __declspec(dllexport)
# define RobotExport __declspec(dllexport) //# define RobotExport __declspec(dllexport) uncomment this to use KDL
# define PartExport __declspec(dllexport) # define PartExport __declspec(dllexport)
# define BaseExport __declspec(dllimport) # define BaseExport __declspec(dllimport)
#else // for Linux #else // for Linux
# define PathExport # define PathExport
# define RobotExport //# define RobotExport uncomment this to use KDL
# define PartExport # define PartExport
# define BaseExport # define BaseExport
#endif #endif