bugfix for libSketchSolver.so: paths for some CAS' toolkits defined explicitly

diff --git a/CMakeCommon/FindCAS.cmake b/CMakeCommon/FindCAS.cmake
index ad673e930a8e810ea14804dae0da750bcfc4ce61..52dacb70a19b895c49364e44f7c3cf63385d4d43 100644 (file)
--- a/CMakeCommon/FindCAS.cmake
+++ b/CMakeCommon/FindCAS.cmake
@@ -152,6 +152,7 @@ SET(CAS_OCAF ${CAS_TKernel} ${CAS_TKMath} ${CAS_TKCDF} ${CAS_TKLCAF})
 SET(CAS_VIEWER ${CAS_TKService} ${CAS_TKV3d} ${CAS_TKG3d} ${CAS_TKGeomBase} ${CAS_TKBRep})
 SET(CAS_OCAFVIS ${CAS_TKCAF} ${CAS_TKBRep} ${CAS_TKG2d})
 SET(CAS_MODELER ${CAS_TKG3d} ${CAS_TKGeomBase} ${CAS_TKGeomAlgo} ${CAS_TKBRep} ${CAS_TKTopAlgo} ${CAS_TKG2d})
+SET(CAS_SHAPE ${CAS_TKShHealing} ${CAS_TKMesh} ${CAS_TKHLR})
 
 SET(CAS_TKV3d_EA ${CAS_TKernel} ${CAS_TKMath} ${CAS_TKV3d})
 SET(CAS_TKBool_EA ${CAS_TKernel} ${CAS_TKMath} ${CAS_TKBRep} ${CAS_TKG2d} ${CAS_TKG3d} ${CAS_TKGeomBase} ${CAS_TKGeomAlgo} ${CAS_TKTopAlgo} ${CAS_TKBool})

diff --git a/src/SketchSolver/CMakeLists.txt b/src/SketchSolver/CMakeLists.txt
index a8525ee70e2db7d9e705981f7e1d97b5c9306470..ae85208d3ed2795ddb353d6879476df00d7c9e91 100644 (file)
--- a/src/SketchSolver/CMakeLists.txt
+++ b/src/SketchSolver/CMakeLists.txt
@@ -18,6 +18,7 @@ SET(PROJECT_SOURCES
 
 SET(PROJECT_LIBRARIES
     ${SLVS_LIBRARIES}
+    ${CAS_SHAPE}
     Events
     ModelAPI
     GeomAPI
@@ -33,13 +34,10 @@ INCLUDE_DIRECTORIES(
 
 ADD_DEFINITIONS(-DSKETCHSOLVER_EXPORTS ${BOOST_DEFINITIONS})
 
-ADD_LIBRARY(SketchSolver MODULE 
-    ${PROJECT_SOURCES} 
-    ${PROJECT_HEADERS}
+ADD_LIBRARY(SketchSolver SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS}
 )
 
-TARGET_LINK_LIBRARIES(SketchSolver
-    ${PROJECT_LIBRARIES}
+TARGET_LINK_LIBRARIES(SketchSolver ${PROJECT_LIBRARIES}
 )
 
 INSTALL(TARGETS SketchSolver DESTINATION plugins)