Explicit inclusion of CAS librarries

diff --git a/CMakeCommon/FindCAS.cmake b/CMakeCommon/FindCAS.cmake
index 52dacb70a19b895c49364e44f7c3cf63385d4d43..7b19e28b8958798d72c64129af7ea0eb7bc38f65 100644 (file)
--- a/CMakeCommon/FindCAS.cmake
+++ b/CMakeCommon/FindCAS.cmake
@@ -152,8 +152,10 @@ 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})
+# TODO(mpv, vsv) Give a proper name for the following variable
 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})
 SET(CAS_TKBRep_EA ${CAS_TKernel} ${CAS_TKMath} ${CAS_TKBRep})

diff --git a/src/ConstructionPlugin/CMakeLists.txt b/src/ConstructionPlugin/CMakeLists.txt
index bbcc6cfdcf2c28913f2a286352c7569026061715..5e27fe1c78fad1b4d6a5a956804eaa16cf9f4916 100644 (file)
--- a/src/ConstructionPlugin/CMakeLists.txt
+++ b/src/ConstructionPlugin/CMakeLists.txt
@@ -17,9 +17,17 @@ SET(XML_RESOURCES
   point_widget.xml
 )
 
+SET(PROJECT_LIBRARIES
+    ModelAPI 
+    GeomAPI 
+    GeomAlgoAPI
+    ${CAS_KERNEL}
+    ${CAS_SHAPE}
+)
+
 ADD_DEFINITIONS(-DCONSTRUCTIONPLUGIN_EXPORTS ${BOOST_DEFINITIONS})
 ADD_LIBRARY(ConstructionPlugin SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES})
-TARGET_LINK_LIBRARIES(ConstructionPlugin ${PROJECT_LIBRARIES} ModelAPI GeomAPI GeomAlgoAPI)
+TARGET_LINK_LIBRARIES(ConstructionPlugin ${PROJECT_LIBRARIES})
 
 INSTALL(TARGETS ConstructionPlugin DESTINATION plugins)
 INSTALL(FILES ${XML_RESOURCES} DESTINATION plugins)

diff --git a/src/ExchangePlugin/CMakeLists.txt b/src/ExchangePlugin/CMakeLists.txt
index 1a5299ad62a1b288a4ba8cb67b8cf5efb8d6f6b3..2a1c85e55a07775a8f7b04ba3f4b866ea23011d1 100644 (file)
--- a/src/ExchangePlugin/CMakeLists.txt
+++ b/src/ExchangePlugin/CMakeLists.txt
@@ -31,6 +31,8 @@ SET(PROJECT_LIBRARIES
     GeomAPI
     ${CAS_OCAF}
     ${CAS_TKCAF}
+    ${CAS_SHAPE}
+    ${CAS_TKBO}
 )
 
 ADD_DEFINITIONS(-DEXCHANGEPLUGIN_EXPORTS ${CAS_DEFINITIONS})

diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt
index 261b08746cbaff901c9b3c1b392f977c01539cb9..3c1f9a45b74a4428c83673a4bcf5de1797acd2ea 100644 (file)
--- a/src/FeaturesPlugin/CMakeLists.txt
+++ b/src/FeaturesPlugin/CMakeLists.txt
@@ -25,9 +25,17 @@ INCLUDE_DIRECTORIES(
   ../GeomAlgoAPI
 )
 
+SET(PROJECT_LIBRARIES
+    ModelAPI 
+    GeomAPI 
+    GeomAlgoAPI
+    ${CAS_KERNEL}
+    ${CAS_SHAPE}
+)
+
 ADD_DEFINITIONS(-DFEATURESPLUGIN_EXPORTS ${BOOST_DEFINITIONS})
 ADD_LIBRARY(FeaturesPlugin SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES})
-TARGET_LINK_LIBRARIES(FeaturesPlugin ${PROJECT_LIBRARIES} ModelAPI GeomAPI GeomAlgoAPI)
+TARGET_LINK_LIBRARIES(FeaturesPlugin ${PROJECT_LIBRARIES})
 
 INSTALL(TARGETS FeaturesPlugin DESTINATION plugins)
 INSTALL(FILES ${XML_RESOURCES} DESTINATION plugins)

diff --git a/src/GeomAPI/CMakeLists.txt b/src/GeomAPI/CMakeLists.txt
index b46cafcee07563ca52c13238d28301ac1a79a89d..e5cad12b1a677fb3172fe5ec2dc3978b0d2ada86 100644 (file)
--- a/src/GeomAPI/CMakeLists.txt
+++ b/src/GeomAPI/CMakeLists.txt
@@ -43,6 +43,13 @@ SET(PROJECT_SOURCES
     GeomAPI_Curve.cpp
 )
 
+SET(PROJECT_LIBRARIES
+    ${CAS_KERNEL} 
+    ${CAS_MODELER} 
+    ${CAS_VIEWER}
+    ${CAS_SHAPE}
+)
+
 ADD_DEFINITIONS(-DGEOMAPI_EXPORTS ${CAS_DEFINITIONS})
 ADD_LIBRARY(GeomAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
 
@@ -55,7 +62,7 @@ INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
 )
 
-TARGET_LINK_LIBRARIES(GeomAPI ${PROJECT_LIBRARIES} ${CAS_KERNEL} ${CAS_MODELER} ${CAS_VIEWER})
+TARGET_LINK_LIBRARIES(GeomAPI ${PROJECT_LIBRARIES})
 
 SET(SWIG_SCRIPTS
   ${CMAKE_CURRENT_BINARY_DIR}/GeomAPI.py

diff --git a/src/GeomAlgoAPI/CMakeLists.txt b/src/GeomAlgoAPI/CMakeLists.txt
index 41d7d8631aa6088ad7f151b5a7de54a36b2f2005..05e91eb61f219862c278b69f91a60c1779763eb9 100644 (file)
--- a/src/GeomAlgoAPI/CMakeLists.txt
+++ b/src/GeomAlgoAPI/CMakeLists.txt
@@ -24,6 +24,14 @@ SET(PROJECT_SOURCES
     GeomAlgoAPI_Boolean.cpp
 )
 
+SET(PROJECT_LIBRARIES
+    GeomAPI 
+    ${CAS_TKBool} 
+    ${CAS_TKBO} 
+    ${CAS_TKPrim}
+    ${CAS_SHAPE}
+)
+
 ADD_DEFINITIONS(-DGEOMALGOAPI_EXPORTS ${CAS_DEFINITIONS})
 ADD_LIBRARY(GeomAlgoAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
 
@@ -37,7 +45,7 @@ INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
 )
 
-TARGET_LINK_LIBRARIES(GeomAlgoAPI ${PROJECT_LIBRARIES} GeomAPI ${CAS_TKBool} ${CAS_TKBO} ${CAS_TKPrim})
+TARGET_LINK_LIBRARIES(GeomAlgoAPI ${PROJECT_LIBRARIES})
 
 SET(SWIG_SCRIPTS
   ${CMAKE_CURRENT_BINARY_DIR}/GeomAlgoAPI.py

diff --git a/src/GeomData/CMakeLists.txt b/src/GeomData/CMakeLists.txt
index a1e450c6ecdf9034de10fcc4910fb24cfebf88ae..af7aa575ab0da041641953599a47e29fe88a3ce1 100644 (file)
--- a/src/GeomData/CMakeLists.txt
+++ b/src/GeomData/CMakeLists.txt
@@ -13,9 +13,17 @@ SET(PROJECT_SOURCES
     GeomData_Point2D.cpp
 )
 
+SET(PROJECT_LIBRARIES
+    ModelAPI 
+    GeomAPI 
+    Events
+    ${CAS_OCAF} 
+    ${CAS_SHAPE}
+)
+
 ADD_DEFINITIONS(-DGEOMDATA_EXPORTS ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS})
 ADD_LIBRARY(GeomData SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
-TARGET_LINK_LIBRARIES(GeomData ${PROJECT_LIBRARIES} ${CAS_OCAF} ModelAPI GeomAPI Events)
+TARGET_LINK_LIBRARIES(GeomData ${PROJECT_LIBRARIES})
 
 INCLUDE_DIRECTORIES(
   ../ModelAPI

diff --git a/src/Model/CMakeLists.txt b/src/Model/CMakeLists.txt
index 8e54742a9ab58b528339d6f9adf6cf1235cdb727..69a821ac3a90d8184c9cee3d21c3490ea9f4fbfe 100644 (file)
--- a/src/Model/CMakeLists.txt
+++ b/src/Model/CMakeLists.txt
@@ -53,12 +53,14 @@ SET(PROJECT_LIBRARIES
     GeomAPI
     ${CAS_OCAF}
     ${CAS_TKCAF}
+    ${CAS_SHAPE}
+    ${CAS_TKBO}
 )
 
 
 
 ADD_DEFINITIONS(-DMODEL_EXPORTS ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS})
-ADD_LIBRARY(Model SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
+ADD_LIBRARY(Model MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS})
 TARGET_LINK_LIBRARIES(Model ${PROJECT_LIBRARIES})
 
 INCLUDE_DIRECTORIES(

diff --git a/src/ModuleBase/CMakeLists.txt b/src/ModuleBase/CMakeLists.txt
index 4c06e43e343bbef524503c91f54c8504c457de47..860e340941d3ccc84d164246ca20409d0f6c8544 100644 (file)
--- a/src/ModuleBase/CMakeLists.txt
+++ b/src/ModuleBase/CMakeLists.txt
@@ -59,6 +59,7 @@ SET(PROJECT_LIBRARIES
     ${QT_LIBRARIES}
        ${CAS_VIEWER}
        ${CAS_KERNEL}
+       ${CAS_SHAPE}
 )
 
 SET(PROJECT_AUTOMOC 

diff --git a/src/NewGeom/CMakeLists.txt b/src/NewGeom/CMakeLists.txt
index 765b727140c55cf18cd0ba388f2886f11dd7a9b1..94def8687ebe25b81576776b94f168e898530447 100644 (file)
--- a/src/NewGeom/CMakeLists.txt
+++ b/src/NewGeom/CMakeLists.txt
@@ -37,6 +37,7 @@ SET(PROJECT_LIBRARIES
        ${CAM}
        ${OCCViewer}
        ${qtx}
+       ${CAS_SHAPE}
 )
 
 ADD_DEFINITIONS( -DNewGeom_EXPORTS ${CAS_DEFINITIONS} )

diff --git a/src/SketchPlugin/CMakeLists.txt b/src/SketchPlugin/CMakeLists.txt
index 898a852b3003091a5f41b72b48c6bcb7c29cf219..d9b7328c2ea0732ddc0ad08055fe11ea30961433 100644 (file)
--- a/src/SketchPlugin/CMakeLists.txt
+++ b/src/SketchPlugin/CMakeLists.txt
@@ -46,6 +46,8 @@ SET(PROJECT_LIBRARIES
     GeomAPI
     GeomAlgoAPI
     ModelAPI
+    ${CAS_KERNEL}
+    ${CAS_SHAPE}
 )
 
 SET(XML_RESOURCES

diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt
index 34fe79010c0933d35f158b01e4978a12605934b4..2582013d59e19019d40c13f7e711a90ee34f1da9 100644 (file)
--- a/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@ -89,6 +89,7 @@ SET(PROJECT_LIBRARIES
        ${QT_LIBRARIES}
        ${CAS_VIEWER}
        ${CAS_KERNEL}
+       ${CAS_SHAPE}
        ${PYTHON_LIBRARIES}
        ${PyConsole}
        ${PyInterp}