From 93d330c5828d53a693ea0c4f670df1d60901a93d Mon Sep 17 00:00:00 2001 From: Sergey BELASH Date: Fri, 26 Sep 2014 20:17:04 +0400 Subject: [PATCH] Explicit inclusion of CAS librarries --- CMakeCommon/FindCAS.cmake | 2 ++ src/ConstructionPlugin/CMakeLists.txt | 10 +++++++++- src/ExchangePlugin/CMakeLists.txt | 2 ++ src/FeaturesPlugin/CMakeLists.txt | 10 +++++++++- src/GeomAPI/CMakeLists.txt | 9 ++++++++- src/GeomAlgoAPI/CMakeLists.txt | 10 +++++++++- src/GeomData/CMakeLists.txt | 10 +++++++++- src/Model/CMakeLists.txt | 4 +++- src/ModuleBase/CMakeLists.txt | 1 + src/NewGeom/CMakeLists.txt | 1 + src/SketchPlugin/CMakeLists.txt | 2 ++ src/XGUI/CMakeLists.txt | 1 + 12 files changed, 56 insertions(+), 6 deletions(-) diff --git a/CMakeCommon/FindCAS.cmake b/CMakeCommon/FindCAS.cmake index 52dacb70a..7b19e28b8 100644 --- 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 bbcc6cfdc..5e27fe1c7 100644 --- 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 1a5299ad6..2a1c85e55 100644 --- 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 261b08746..3c1f9a45b 100644 --- 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 b46cafcee..e5cad12b1 100644 --- 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 41d7d8631..05e91eb61 100644 --- 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 a1e450c6e..af7aa575a 100644 --- 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 8e54742a9..69a821ac3 100644 --- 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 4c06e43e3..860e34094 100644 --- 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 765b72714..94def8687 100644 --- 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 898a852b3..d9b7328c2 100644 --- 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 34fe79010..2582013d5 100644 --- 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} -- 2.39.2