diff --git a/src/Mod/Measure/App/CMakeLists.txt b/src/Mod/Measure/App/CMakeLists.txt index d99efcc1ba..349d8e2581 100644 --- a/src/Mod/Measure/App/CMakeLists.txt +++ b/src/Mod/Measure/App/CMakeLists.txt @@ -40,7 +40,6 @@ SET(MeasureModule_SRCS SOURCE_GROUP("Module" FILES ${MeasureModule_SRCS}) - SET(Measure_SRCS ${MeasureModule_SRCS} ${Python_SRCS} @@ -83,5 +82,4 @@ fc_target_copy_resource_flat(Measure SET_BIN_DIR(Measure Measure /Mod/Measure) SET_PYTHON_PREFIX_SUFFIX(Measure) - INSTALL(TARGETS Measure DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/src/Mod/Measure/App/MeasurementPyImp.cpp b/src/Mod/Measure/App/MeasurementPyImp.cpp index 029c089088..2843793734 100644 --- a/src/Mod/Measure/App/MeasurementPyImp.cpp +++ b/src/Mod/Measure/App/MeasurementPyImp.cpp @@ -29,12 +29,11 @@ #include #include -#include "Measurement.h" - // inclusion of the generated files (generated out of SketchObjectSFPy.xml) #include "MeasurementPy.h" #include "MeasurementPy.cpp" + using namespace Measure; // returns a string which represents the object e.g. when printed in python diff --git a/src/Mod/Measure/App/PreCompiled.h b/src/Mod/Measure/App/PreCompiled.h index 7b91a9c40b..c3312d4d1c 100644 --- a/src/Mod/Measure/App/PreCompiled.h +++ b/src/Mod/Measure/App/PreCompiled.h @@ -20,7 +20,6 @@ * * ***************************************************************************/ - #ifndef __PRECOMPILED__ #define __PRECOMPILED__ @@ -29,33 +28,28 @@ #ifdef FC_OS_WIN32 #define WIN32_LEAN_AND_MEAN #ifndef NOMINMAX -#define NOMINMAX +# define NOMINMAX #endif #endif #ifdef _PreComp_ // standard -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include #include -#include -#include #include +#include +#include +#include +#include +#include +#include #elif defined(FC_OS_WIN32) -#include +# include #endif // _PreComp_ + #endif