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
Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0
[modules/shaper.git]
/
src
/
Model
/
CMakeLists.txt
diff --git
a/src/Model/CMakeLists.txt
b/src/Model/CMakeLists.txt
index 63d79a60eb9d0c02433bb48cb561820c428e6449..eef87c35f0ab499310e9e2537fa811087cd2ddce 100644
(file)
--- a/
src/Model/CMakeLists.txt
+++ b/
src/Model/CMakeLists.txt
@@
-1,10
+1,12
@@
+## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
INCLUDE(Common)
SET(PROJECT_HEADERS
Model.h
Model_Application.h
Model_Document.h
INCLUDE(Common)
SET(PROJECT_HEADERS
Model.h
Model_Application.h
Model_Document.h
- Model_
PluginManager
.h
+ Model_
Session
.h
Model_Data.h
Model_AttributeDouble.h
Model_AttributeDocRef.h
Model_Data.h
Model_AttributeDouble.h
Model_AttributeDocRef.h
@@
-12,22
+14,26
@@
SET(PROJECT_HEADERS
Model_AttributeRefAttr.h
Model_AttributeRefList.h
Model_AttributeBoolean.h
Model_AttributeRefAttr.h
Model_AttributeRefList.h
Model_AttributeBoolean.h
+ Model_AttributeIntArray.h
Model_AttributeString.h
Model_AttributeInteger.h
Model_AttributeString.h
Model_AttributeInteger.h
+ Model_AttributeSelection.h
+ Model_AttributeSelectionList.h
Model_Events.h
Model_Update.h
Model_Validator.h
Model_ResultBody.h
Model_ResultConstruction.h
Model_ResultPart.h
Model_Events.h
Model_Update.h
Model_Validator.h
Model_ResultBody.h
Model_ResultConstruction.h
Model_ResultPart.h
- Model_ResultValidators.h
- Model_FeatureValidator.h
+ Model_ResultGroup.h
+ Model_ResultParameter.h
+ Model_FeatureValidator.h
)
SET(PROJECT_SOURCES
Model_Application.cpp
Model_Document.cpp
)
SET(PROJECT_SOURCES
Model_Application.cpp
Model_Document.cpp
- Model_
PluginManager
.cpp
+ Model_
Session
.cpp
Model_Data.cpp
Model_AttributeDouble.cpp
Model_AttributeDocRef.cpp
Model_Data.cpp
Model_AttributeDouble.cpp
Model_AttributeDocRef.cpp
@@
-35,16
+41,20
@@
SET(PROJECT_SOURCES
Model_AttributeRefAttr.cpp
Model_AttributeRefList.cpp
Model_AttributeBoolean.cpp
Model_AttributeRefAttr.cpp
Model_AttributeRefList.cpp
Model_AttributeBoolean.cpp
+ Model_AttributeIntArray.cpp
Model_AttributeString.cpp
Model_AttributeInteger.cpp
Model_AttributeString.cpp
Model_AttributeInteger.cpp
+ Model_AttributeSelection.cpp
+ Model_AttributeSelectionList.cpp
Model_Events.cpp
Model_Update.cpp
Model_Validator.cpp
Model_ResultBody.cpp
Model_ResultConstruction.cpp
Model_ResultPart.cpp
Model_Events.cpp
Model_Update.cpp
Model_Validator.cpp
Model_ResultBody.cpp
Model_ResultConstruction.cpp
Model_ResultPart.cpp
- Model_ResultValidators.cpp
- Model_FeatureValidator.cpp
+ Model_ResultGroup.cpp
+ Model_ResultParameter.cpp
+ Model_FeatureValidator.cpp
)
SET(PROJECT_LIBRARIES
)
SET(PROJECT_LIBRARIES
@@
-53,13
+63,16
@@
SET(PROJECT_LIBRARIES
Config
GeomData
GeomAPI
Config
GeomData
GeomAPI
+ GeomAlgoAPI
${CAS_OCAF}
${CAS_TKCAF}
${CAS_OCAF}
${CAS_TKCAF}
+ ${CAS_SHAPE}
+ ${CAS_TKBO}
)
)
-ADD_DEFINITIONS(-DMODEL_EXPORTS ${CAS_DEFINITIONS}
${BOOST_DEFINITIONS}
)
+ADD_DEFINITIONS(-DMODEL_EXPORTS ${CAS_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})
@@
-69,6
+82,7
@@
INCLUDE_DIRECTORIES(
../Config
../GeomData
../GeomDataAPI
../Config
../GeomData
../GeomDataAPI
+ ../GeomAlgoAPI
../GeomAPI
${CAS_INCLUDE_DIRS}
)
../GeomAPI
${CAS_INCLUDE_DIRS}
)