Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update unit tests for CollectionPlugin module
[modules/shaper.git]
/
src
/
Model
/
CMakeLists.txt
diff --git
a/src/Model/CMakeLists.txt
b/src/Model/CMakeLists.txt
index 37dfcb27424d05e826b24dacfaca1fde0304ef0d..a5138d2fa25b72f3bc6fbae5c484277bc0b92ff3 100644
(file)
--- a/
src/Model/CMakeLists.txt
+++ b/
src/Model/CMakeLists.txt
@@
-48,7
+48,6
@@
SET(PROJECT_HEADERS
Model_Update.h
Model_Validator.h
Model_ResultBody.h
Model_Update.h
Model_Validator.h
Model_ResultBody.h
- Model_ResultCompSolid.h
Model_ResultConstruction.h
Model_ResultPart.h
Model_ResultField.h
Model_ResultConstruction.h
Model_ResultPart.h
Model_ResultField.h
@@
-56,7
+55,6
@@
SET(PROJECT_HEADERS
Model_ResultParameter.h
Model_FeatureValidator.h
Model_AttributeValidator.h
Model_ResultParameter.h
Model_FeatureValidator.h
Model_AttributeValidator.h
- Model_SelectionNaming.h
)
SET(PROJECT_SOURCES
)
SET(PROJECT_SOURCES
@@
-86,7
+84,6
@@
SET(PROJECT_SOURCES
Model_Update.cpp
Model_Validator.cpp
Model_ResultBody.cpp
Model_Update.cpp
Model_Validator.cpp
Model_ResultBody.cpp
- Model_ResultCompSolid.cpp
Model_ResultConstruction.cpp
Model_ResultPart.cpp
Model_ResultField.cpp
Model_ResultConstruction.cpp
Model_ResultPart.cpp
Model_ResultField.cpp
@@
-94,30
+91,30
@@
SET(PROJECT_SOURCES
Model_ResultParameter.cpp
Model_FeatureValidator.cpp
Model_AttributeValidator.cpp
Model_ResultParameter.cpp
Model_FeatureValidator.cpp
Model_AttributeValidator.cpp
- Model_SelectionNaming.cpp
)
SET(PROJECT_LIBRARIES
ModelAPI
Events
Config
)
SET(PROJECT_LIBRARIES
ModelAPI
Events
Config
+ Selector
GeomData
GeomAPI
GeomAlgoAPI
GeomData
GeomAPI
GeomAlgoAPI
- ${CAS_OCAF}
- ${CAS_TKCAF}
- ${CAS_SHAPE}
- ${CAS_TKBO}
+ ModelGeomAlgo
+ ${OpenCASCADE_ApplicationFramework_LIBRARIES}
)
SET(PROJECT_INCLUDES
../ModelAPI
../Events
../Config
)
SET(PROJECT_INCLUDES
../ModelAPI
../Events
../Config
+ ../Selector
../GeomData
../GeomDataAPI
../GeomAlgoAPI
../GeomAPI
../GeomData
../GeomDataAPI
../GeomAlgoAPI
../GeomAPI
- ${CAS_INCLUDE_DIRS}
+ ../ModelGeomAlgo
+ ${OpenCASCADE_INCLUDE_DIR}
)
)
@@
-125,7
+122,7
@@
IF(TKTInspector)
ADD_DEFINITIONS(-DTINSPECTOR)
ENDIF()
ADD_DEFINITIONS(-DTINSPECTOR)
ENDIF()
-ADD_DEFINITIONS(-DMODEL_EXPORTS ${
CAS
_DEFINITIONS})
+ADD_DEFINITIONS(-DMODEL_EXPORTS ${
OpenCASCADE
_DEFINITIONS})
ADD_LIBRARY(Model SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
TARGET_LINK_LIBRARIES(Model ${PROJECT_LIBRARIES})
ADD_LIBRARY(Model SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
TARGET_LINK_LIBRARIES(Model ${PROJECT_LIBRARIES})