SketchSolver: porting to Linux

diff --git a/CMakeCommon/FindSolveSpace.cmake b/CMakeCommon/FindSolveSpace.cmake
index c8d269f521cb9a4a642145438440b5087090dd2e..d3c0811e0d30278be45bebf4a42eb4b028160174 100644 (file)
--- a/CMakeCommon/FindSolveSpace.cmake
+++ b/CMakeCommon/FindSolveSpace.cmake
@@ -3,4 +3,4 @@ SET(SLVS_ROOT_DIR $ENV{SOLVESPACE_ROOT_DIR})
 INCLUDE_DIRECTORIES(${SLVS_ROOT_DIR}/include)
 LINK_DIRECTORIES(${SLVS_ROOT_DIR}/lib)
 
-#SET(SLVS_LIBRARIES ${SLVS_ROOT_DIR}/lib/slvs.lib)
+SET(SLVS_LIBRARIES slvs)

diff --git a/src/SketchPlugin/SketchPlugin_Feature.h b/src/SketchPlugin/SketchPlugin_Feature.h
index 2121573295d13e5916eda4beeb8d547d6adb143f..b9c32307157ce6dd76d7f566ca7f369faf15fad2 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_Feature.h
+++ b/src/SketchPlugin/SketchPlugin_Feature.h
@@ -47,7 +47,7 @@ protected:
   SketchPlugin_Feature();
   /// Sets the data manager of an object and here initializes mySketch field
   SKETCHPLUGIN_EXPORT virtual void setData(boost::shared_ptr<ModelAPI_Data> theData)
-  {}
+  {ModelAPI_Feature::setData(theData);}
 
   friend class SketchPlugin_Sketch;
 

diff --git a/src/SketchPlugin/SketchPlugin_Sketch.cpp b/src/SketchPlugin/SketchPlugin_Sketch.cpp
index 6691c6f85e5230299161e16484d53b0e3647cbcc..13b61db1fbfaf04c26121633d179d7b75d351804 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_Sketch.cpp
+++ b/src/SketchPlugin/SketchPlugin_Sketch.cpp
@@ -13,9 +13,6 @@
 
 using namespace std;
 
-/// the active sketch
-boost::shared_ptr<SketchPlugin_Sketch> MY_ACITVE_SKETCH;
-
 // face of the square-face displayed for selection of general plane
 const double PLANE_SIZE = 200;