Add support for CLbundler created LibPack
* New 'UseLibPack' cmake file sets CMAKE_PREFIX_PATH so that find_package can be used for most packages. * Mimic fc_wrap_cpp defined in other 'UseLibPack' files. Some file dependencies did not get set correctly otherwise. * OCE 0.16 does not have Standard_ctype.hxx * shfolder.h can't be used with Win SDK 7.0
This commit is contained in:
@@ -114,7 +114,7 @@
|
||||
#include <Standard_Underflow.hxx>
|
||||
#include <Standard_UUID.hxx>
|
||||
#include <Standard_WayOfLife.hxx>
|
||||
#if OCC_VERSION_HEX < 0x060800
|
||||
#if OCC_VERSION_HEX < 0x060700
|
||||
#include <Standard_ctype.hxx>
|
||||
#include <Standard_OId.hxx>
|
||||
#endif
|
||||
|
||||
@@ -20,7 +20,6 @@ include_directories(
|
||||
set(Mesh_LIBS
|
||||
${Boost_LIBRARIES}
|
||||
${QT_QTCORE_LIBRARY}
|
||||
${QT_QTCORE_LIBRARY_DEBUG}
|
||||
FreeCADBase
|
||||
FreeCADApp
|
||||
)
|
||||
|
||||
@@ -20,20 +20,11 @@ include_directories(
|
||||
)
|
||||
link_directories(${OCC_LIBRARY_DIR})
|
||||
|
||||
if(MSVC)
|
||||
set(Robot_LIBS
|
||||
Part
|
||||
${QT_QTCORE_LIBRARY}
|
||||
${QT_QTCORE_LIBRARY_DEBUG}
|
||||
FreeCADApp
|
||||
)
|
||||
else(MSVC)
|
||||
set(Robot_LIBS
|
||||
Part
|
||||
${QT_QTCORE_LIBRARY}
|
||||
FreeCADApp
|
||||
)
|
||||
endif(MSVC)
|
||||
set(Robot_LIBS
|
||||
Part
|
||||
${QT_QTCORE_LIBRARY}
|
||||
FreeCADApp
|
||||
)
|
||||
|
||||
FILE( GLOB KDL_SRCS kdl_cp/[^.]*.cpp )
|
||||
FILE( GLOB KDL_HPPS kdl_cp/[^.]*.hpp kdl_cp/[^.]*.inl)
|
||||
|
||||
Reference in New Issue
Block a user