[Image] remove unused headers and Xerces
This commit is contained in:
@@ -10,16 +10,11 @@
|
||||
***************************************************************************/
|
||||
|
||||
#include "PreCompiled.h"
|
||||
#ifndef _PreComp_
|
||||
# include <Python.h>
|
||||
#endif
|
||||
|
||||
#include <CXX/Extensions.hxx>
|
||||
#include <CXX/Objects.hxx>
|
||||
|
||||
#include <Base/Console.h>
|
||||
#include <Base/Interpreter.h>
|
||||
#include <Base/PyObjectBase.h>
|
||||
|
||||
#include "ImagePlane.h"
|
||||
|
||||
|
||||
|
||||
@@ -1,39 +1,38 @@
|
||||
if(WIN32)
|
||||
add_definitions(-DFCAppImage)
|
||||
endif(WIN32)
|
||||
|
||||
if(OPENCV2_FOUND)
|
||||
add_definitions(-DHAVE_OPENCV2)
|
||||
endif(OPENCV2_FOUND)
|
||||
|
||||
include_directories(
|
||||
${OPENCV_INCLUDE2_DIR}
|
||||
${PYTHON_INCLUDE_DIRS}
|
||||
${Boost_INCLUDE_DIRS}
|
||||
${ZLIB_INCLUDE_DIR}
|
||||
${XercesC_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
set(Image_LIBS
|
||||
${OPENCV2_LIBRARIES}
|
||||
FreeCADApp
|
||||
)
|
||||
|
||||
set(Image_SRCS
|
||||
ImageBase.cpp
|
||||
ImageBase.h
|
||||
ImagePlane.cpp
|
||||
ImagePlane.h
|
||||
PreCompiled.cpp
|
||||
PreCompiled.h
|
||||
AppImage.cpp
|
||||
)
|
||||
|
||||
add_library(Image SHARED ${Image_SRCS})
|
||||
target_link_libraries(Image ${Image_LIBS})
|
||||
|
||||
|
||||
SET_BIN_DIR(Image Image /Mod/Image)
|
||||
SET_PYTHON_PREFIX_SUFFIX(Image)
|
||||
|
||||
INSTALL(TARGETS Image DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
if(WIN32)
|
||||
add_definitions(-DFCAppImage)
|
||||
endif(WIN32)
|
||||
|
||||
if(OPENCV2_FOUND)
|
||||
add_definitions(-DHAVE_OPENCV2)
|
||||
endif(OPENCV2_FOUND)
|
||||
|
||||
include_directories(
|
||||
${OPENCV_INCLUDE2_DIR}
|
||||
${PYTHON_INCLUDE_DIRS}
|
||||
${Boost_INCLUDE_DIRS}
|
||||
${ZLIB_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
set(Image_LIBS
|
||||
${OPENCV2_LIBRARIES}
|
||||
FreeCADApp
|
||||
)
|
||||
|
||||
set(Image_SRCS
|
||||
ImageBase.cpp
|
||||
ImageBase.h
|
||||
ImagePlane.cpp
|
||||
ImagePlane.h
|
||||
PreCompiled.cpp
|
||||
PreCompiled.h
|
||||
AppImage.cpp
|
||||
)
|
||||
|
||||
add_library(Image SHARED ${Image_SRCS})
|
||||
target_link_libraries(Image ${Image_LIBS})
|
||||
|
||||
|
||||
SET_BIN_DIR(Image Image /Mod/Image)
|
||||
SET_PYTHON_PREFIX_SUFFIX(Image)
|
||||
|
||||
INSTALL(TARGETS Image DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
|
||||
@@ -16,13 +16,10 @@
|
||||
***************************************************************************/
|
||||
|
||||
#include "PreCompiled.h"
|
||||
#ifndef _PreComp_
|
||||
# include <cmath>
|
||||
# include <cstring>
|
||||
#endif
|
||||
|
||||
#include "ImageBase.h"
|
||||
#include <Base/Exception.h>
|
||||
#include "ImageBase.h"
|
||||
|
||||
|
||||
using namespace Image;
|
||||
|
||||
|
||||
@@ -18,8 +18,6 @@
|
||||
#ifndef IMAGEBASE_H
|
||||
#define IMAGEBASE_H
|
||||
|
||||
#include <Mod/Image/ImageGlobal.h>
|
||||
|
||||
namespace Image
|
||||
{
|
||||
|
||||
|
||||
@@ -20,15 +20,10 @@
|
||||
* *
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
#include "PreCompiled.h"
|
||||
|
||||
#ifndef _PreComp_
|
||||
#endif
|
||||
|
||||
#include "ImagePlane.h"
|
||||
#include <App/DocumentObjectPy.h>
|
||||
#include <Base/Placement.h>
|
||||
|
||||
|
||||
using namespace Image;
|
||||
using namespace App;
|
||||
|
||||
@@ -20,14 +20,12 @@
|
||||
* *
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
#ifndef Image_ImagePlane_H
|
||||
#define Image_ImagePlane_H
|
||||
|
||||
#include <App/GeoFeature.h>
|
||||
#include <App/PropertyFile.h>
|
||||
#include <App/PropertyUnits.h>
|
||||
#include <Mod/Image/ImageGlobal.h>
|
||||
|
||||
namespace Image
|
||||
{
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
* *
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
#ifndef __PRECOMPILED__
|
||||
#define __PRECOMPILED__
|
||||
|
||||
@@ -52,8 +51,6 @@
|
||||
#include <set>
|
||||
#include <bitset>
|
||||
|
||||
#include <Python.h>
|
||||
|
||||
#endif // _PreComp_
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user