From 404b76982d24707b1f95a05eda3dd1928c850e62 Mon Sep 17 00:00:00 2001 From: azv Date: Tue, 20 May 2014 12:10:25 +0400 Subject: [PATCH] SketchSolver: porting to Linux --- CMakeCommon/FindSolveSpace.cmake | 2 +- src/SketchPlugin/SketchPlugin_Feature.h | 2 +- src/SketchPlugin/SketchPlugin_Sketch.cpp | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/CMakeCommon/FindSolveSpace.cmake b/CMakeCommon/FindSolveSpace.cmake index c8d269f52..d3c0811e0 100644 --- 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 212157329..b9c323071 100644 --- 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 theData) - {} + {ModelAPI_Feature::setData(theData);} friend class SketchPlugin_Sketch; diff --git a/src/SketchPlugin/SketchPlugin_Sketch.cpp b/src/SketchPlugin/SketchPlugin_Sketch.cpp index 6691c6f85..13b61db1f 100644 --- 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 MY_ACITVE_SKETCH; - // face of the square-face displayed for selection of general plane const double PLANE_SIZE = 200; -- 2.39.2