From 1035bf933e269bb31c23aac191815f2a42f9ed0a Mon Sep 17 00:00:00 2001 From: mpv Date: Mon, 13 Jul 2015 14:36:46 +0300 Subject: [PATCH] In addition to the issue #608 remove OCCT includes from the plugins. --- src/ConstructionPlugin/CMakeLists.txt | 2 -- src/Events/CMakeLists.txt | 1 - src/ExchangePlugin/CMakeLists.txt | 3 +-- src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp | 2 -- src/ExchangePlugin/ExchangePlugin_ImportFeature.cpp | 2 -- src/SketchPlugin/CMakeLists.txt | 2 -- src/SketchSolver/CMakeLists.txt | 1 - 7 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/ConstructionPlugin/CMakeLists.txt b/src/ConstructionPlugin/CMakeLists.txt index 302e08bb3..1c4aa2e68 100644 --- a/src/ConstructionPlugin/CMakeLists.txt +++ b/src/ConstructionPlugin/CMakeLists.txt @@ -30,8 +30,6 @@ SET(PROJECT_LIBRARIES ModelAPI GeomAPI GeomAlgoAPI - ${CAS_KERNEL} - ${CAS_SHAPE} ) ADD_DEFINITIONS(-DCONSTRUCTIONPLUGIN_EXPORTS) diff --git a/src/Events/CMakeLists.txt b/src/Events/CMakeLists.txt index 2d7b6caf7..c9cb2beb0 100644 --- a/src/Events/CMakeLists.txt +++ b/src/Events/CMakeLists.txt @@ -33,7 +33,6 @@ SET_SOURCE_FILES_PROPERTIES(Events.i PROPERTIES CPLUSPLUS ON) SET_SOURCE_FILES_PROPERTIES(Events.i PROPERTIES SWIG_DEFINITIONS "-shadow") INCLUDE_DIRECTORIES( - ${CAS_INCLUDE_DIRS} ) TARGET_LINK_LIBRARIES(Events ${PROJECT_LIBRARIES}) diff --git a/src/ExchangePlugin/CMakeLists.txt b/src/ExchangePlugin/CMakeLists.txt index 3e649e183..99041c961 100644 --- a/src/ExchangePlugin/CMakeLists.txt +++ b/src/ExchangePlugin/CMakeLists.txt @@ -8,7 +8,6 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/Events ${PROJECT_SOURCE_DIR}/src/ModelAPI ${PROJECT_SOURCE_DIR}/src/GeomAPI ${PROJECT_SOURCE_DIR}/src/GeomAlgoAPI - ${CAS_INCLUDE_DIRS} ) SET(PROJECT_HEADERS @@ -40,7 +39,7 @@ SET(PROJECT_LIBRARIES GeomAlgoAPI ) -ADD_DEFINITIONS(-DEXCHANGEPLUGIN_EXPORTS ${CAS_DEFINITIONS}) +ADD_DEFINITIONS(-DEXCHANGEPLUGIN_EXPORTS) ADD_LIBRARY(ExchangePlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES}) TARGET_LINK_LIBRARIES(ExchangePlugin ${PROJECT_LIBRARIES}) diff --git a/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp b/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp index 882a14a00..0fb48d770 100644 --- a/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp +++ b/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp @@ -26,8 +26,6 @@ #include #include -#include - #include #include #include diff --git a/src/ExchangePlugin/ExchangePlugin_ImportFeature.cpp b/src/ExchangePlugin/ExchangePlugin_ImportFeature.cpp index bcf06561e..e7e9e1b98 100644 --- a/src/ExchangePlugin/ExchangePlugin_ImportFeature.cpp +++ b/src/ExchangePlugin/ExchangePlugin_ImportFeature.cpp @@ -22,8 +22,6 @@ #include #include -#include - #include #include #ifdef _DEBUG diff --git a/src/SketchPlugin/CMakeLists.txt b/src/SketchPlugin/CMakeLists.txt index 0c49b56a9..914dcfc59 100644 --- a/src/SketchPlugin/CMakeLists.txt +++ b/src/SketchPlugin/CMakeLists.txt @@ -74,8 +74,6 @@ SET(PROJECT_LIBRARIES ModelAPI SketcherPrs GeomDataAPI - ${CAS_KERNEL} - ${CAS_SHAPE} ) SET(XML_RESOURCES diff --git a/src/SketchSolver/CMakeLists.txt b/src/SketchSolver/CMakeLists.txt index 9cf51643a..5b5e1dda5 100644 --- a/src/SketchSolver/CMakeLists.txt +++ b/src/SketchSolver/CMakeLists.txt @@ -49,7 +49,6 @@ SET(PROJECT_SOURCES SET(PROJECT_LIBRARIES ${SLVS_LIBRARIES} - ${CAS_SHAPE} Config Events ModelAPI -- 2.39.2