diff --git a/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp b/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp index a11eedb24e..a68057aa93 100644 --- a/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp +++ b/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp @@ -20,10 +20,8 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ -# include # include # include #endif diff --git a/src/Mod/ReverseEngineering/App/CMakeLists.txt b/src/Mod/ReverseEngineering/App/CMakeLists.txt index 8a7b949f58..1ea1a8457a 100644 --- a/src/Mod/ReverseEngineering/App/CMakeLists.txt +++ b/src/Mod/ReverseEngineering/App/CMakeLists.txt @@ -1,82 +1,81 @@ -if(MSVC) - add_definitions(-DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - -if (PCL_SURFACE_FOUND AND PCL_FEATURES_FOUND) - add_definitions(-DHAVE_PCL_SURFACE) - - if(EXISTS "${PCL_INCLUDE_DIRS}/pcl/surface/on_nurbs/fitting_surface_tdm.h") - add_definitions(-DHAVE_PCL_OPENNURBS) - endif() -endif () - -if (PCL_FILTERS_FOUND AND PCL_FEATURES_FOUND) - add_definitions(-DHAVE_PCL_FILTERS) -endif () - -if (PCL_SEGMENTATION_FOUND AND PCL_FEATURES_FOUND) - add_definitions(-DHAVE_PCL_SEGMENTATION) -endif () - -if (PCL_SAMPLE_CONSENSUS_FOUND) - add_definitions(-DHAVE_PCL_SAMPLE_CONSENSUS) -endif () - -include_directories( - ${CMAKE_SOURCE_DIR}/src - ${Boost_INCLUDE_DIRS} - ${OCC_INCLUDE_DIR} - ${PYTHON_INCLUDE_DIRS} - ${XercesC_INCLUDE_DIRS} - ${ZLIB_INCLUDE_DIR} - ${EIGEN3_INCLUDE_DIR} - ${PCL_INCLUDE_DIRS} - ${FLANN_INCLUDE_DIRS} -) - -link_directories(${OCC_LIBRARY_DIR}) - -set(Reen_LIBS - Part - Mesh - Points - FreeCADApp - ${PCL_COMMON_LIBRARIES} - ${PCL_KDTREE_LIBRARIES} - ${PCL_FEATURES_LIBRARIES} - ${PCL_FILTERS_LIBRARIES} - ${PCL_SEARCH_LIBRARIES} - ${PCL_SURFACE_LIBRARIES} - ${PCL_SEGMENTATION_LIBRARIES} - ${PCL_SAMPLE_CONSENSUS_LIBRARIES} - ${QT_QTCORE_LIBRARY} -) - -SET(Reen_SRCS - AppReverseEngineering.cpp - ApproxSurface.cpp - ApproxSurface.h - BSplineFitting.cpp - BSplineFitting.h - RegionGrowing.cpp - RegionGrowing.h - SampleConsensus.cpp - SampleConsensus.h - Segmentation.cpp - Segmentation.h - SurfaceTriangulation.cpp - SurfaceTriangulation.h - PreCompiled.cpp - PreCompiled.h -) - -add_library(ReverseEngineering SHARED ${Reen_SRCS}) -target_link_libraries(ReverseEngineering ${Reen_LIBS}) - - -SET_BIN_DIR(ReverseEngineering ReverseEngineering /Mod/ReverseEngineering) -SET_PYTHON_PREFIX_SUFFIX(ReverseEngineering) - -INSTALL(TARGETS ReverseEngineering DESTINATION ${CMAKE_INSTALL_LIBDIR}) +if(MSVC) + add_definitions(-DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH) +else(MSVC) + add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) +endif(MSVC) + +if (PCL_SURFACE_FOUND AND PCL_FEATURES_FOUND) + add_definitions(-DHAVE_PCL_SURFACE) + + if(EXISTS "${PCL_INCLUDE_DIRS}/pcl/surface/on_nurbs/fitting_surface_tdm.h") + add_definitions(-DHAVE_PCL_OPENNURBS) + endif() +endif () + +if (PCL_FILTERS_FOUND AND PCL_FEATURES_FOUND) + add_definitions(-DHAVE_PCL_FILTERS) +endif () + +if (PCL_SEGMENTATION_FOUND AND PCL_FEATURES_FOUND) + add_definitions(-DHAVE_PCL_SEGMENTATION) +endif () + +if (PCL_SAMPLE_CONSENSUS_FOUND) + add_definitions(-DHAVE_PCL_SAMPLE_CONSENSUS) +endif () + +include_directories( + ${CMAKE_SOURCE_DIR}/src + ${Boost_INCLUDE_DIRS} + ${OCC_INCLUDE_DIR} + ${PYTHON_INCLUDE_DIRS} + ${ZLIB_INCLUDE_DIR} + ${EIGEN3_INCLUDE_DIR} + ${PCL_INCLUDE_DIRS} + ${FLANN_INCLUDE_DIRS} +) + +link_directories(${OCC_LIBRARY_DIR}) + +set(Reen_LIBS + Part + Mesh + Points + FreeCADApp + ${PCL_COMMON_LIBRARIES} + ${PCL_KDTREE_LIBRARIES} + ${PCL_FEATURES_LIBRARIES} + ${PCL_FILTERS_LIBRARIES} + ${PCL_SEARCH_LIBRARIES} + ${PCL_SURFACE_LIBRARIES} + ${PCL_SEGMENTATION_LIBRARIES} + ${PCL_SAMPLE_CONSENSUS_LIBRARIES} + ${QT_QTCORE_LIBRARY} +) + +SET(Reen_SRCS + AppReverseEngineering.cpp + ApproxSurface.cpp + ApproxSurface.h + BSplineFitting.cpp + BSplineFitting.h + RegionGrowing.cpp + RegionGrowing.h + SampleConsensus.cpp + SampleConsensus.h + Segmentation.cpp + Segmentation.h + SurfaceTriangulation.cpp + SurfaceTriangulation.h + PreCompiled.cpp + PreCompiled.h +) + +add_library(ReverseEngineering SHARED ${Reen_SRCS}) +target_link_libraries(ReverseEngineering ${Reen_LIBS}) + + +SET_BIN_DIR(ReverseEngineering ReverseEngineering /Mod/ReverseEngineering) +SET_PYTHON_PREFIX_SUFFIX(ReverseEngineering) + +INSTALL(TARGETS ReverseEngineering DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/src/Mod/ReverseEngineering/App/PreCompiled.h b/src/Mod/ReverseEngineering/App/PreCompiled.h index e338d89b3b..fb97580f11 100644 --- a/src/Mod/ReverseEngineering/App/PreCompiled.h +++ b/src/Mod/ReverseEngineering/App/PreCompiled.h @@ -78,9 +78,6 @@ #include #include -#include - - #endif #endif // _PreComp_ diff --git a/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp b/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp index 1bde1eeb9c..9c2a1a9003 100644 --- a/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp +++ b/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp @@ -20,11 +20,7 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -# include -#endif #include #include @@ -36,6 +32,7 @@ #include #include + // use a different name to CreateCommand() void CreateReverseEngineeringCommands(void); diff --git a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt index 183ec9aea1..a25f86a17a 100644 --- a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt +++ b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt @@ -13,7 +13,6 @@ include_directories( ${COIN3D_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} - ${XercesC_INCLUDE_DIRS} ) link_directories(${OCC_LIBRARY_DIR}) diff --git a/src/Mod/ReverseEngineering/Gui/PreCompiled.h b/src/Mod/ReverseEngineering/Gui/PreCompiled.h index 1fa84c104c..0427c20501 100644 --- a/src/Mod/ReverseEngineering/Gui/PreCompiled.h +++ b/src/Mod/ReverseEngineering/Gui/PreCompiled.h @@ -20,7 +20,6 @@ * * ***************************************************************************/ - #ifndef __PRECOMPILED_GUI__ #define __PRECOMPILED_GUI__ @@ -49,10 +48,6 @@ #ifdef _PreComp_ - -// Python -#include - // standard #include #include @@ -73,7 +68,6 @@ # include #endif - // Qt Toolkit #ifndef __QtAll__ # include