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 3d7716827fd526888c7f9a57d31c866e9b176e7c..eef87c35f0ab499310e9e2537fa811087cd2ddce 100644
(file)
--- a/
src/Model/CMakeLists.txt
+++ b/
src/Model/CMakeLists.txt
@@
-1,3
+1,5
@@
+## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
INCLUDE(Common)
SET(PROJECT_HEADERS
INCLUDE(Common)
SET(PROJECT_HEADERS
@@
-12,6
+14,7
@@
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_AttributeSelection.h
Model_AttributeString.h
Model_AttributeInteger.h
Model_AttributeSelection.h
@@
-23,6
+26,7
@@
SET(PROJECT_HEADERS
Model_ResultConstruction.h
Model_ResultPart.h
Model_ResultGroup.h
Model_ResultConstruction.h
Model_ResultPart.h
Model_ResultGroup.h
+ Model_ResultParameter.h
Model_FeatureValidator.h
)
Model_FeatureValidator.h
)
@@
-37,6
+41,7
@@
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_AttributeSelection.cpp
Model_AttributeString.cpp
Model_AttributeInteger.cpp
Model_AttributeSelection.cpp
@@
-48,6
+53,7
@@
SET(PROJECT_SOURCES
Model_ResultConstruction.cpp
Model_ResultPart.cpp
Model_ResultGroup.cpp
Model_ResultConstruction.cpp
Model_ResultPart.cpp
Model_ResultGroup.cpp
+ Model_ResultParameter.cpp
Model_FeatureValidator.cpp
)
Model_FeatureValidator.cpp
)
@@
-66,8
+72,8
@@
SET(PROJECT_LIBRARIES
-ADD_DEFINITIONS(-DMODEL_EXPORTS ${CAS_DEFINITIONS}
${BOOST_DEFINITIONS}
)
-ADD_LIBRARY(Model
MODULE
${PROJECT_SOURCES} ${PROJECT_HEADERS})
+ADD_DEFINITIONS(-DMODEL_EXPORTS ${CAS_DEFINITIONS})
+ADD_LIBRARY(Model
SHARED
${PROJECT_SOURCES} ${PROJECT_HEADERS})
TARGET_LINK_LIBRARIES(Model ${PROJECT_LIBRARIES})
INCLUDE_DIRECTORIES(
TARGET_LINK_LIBRARIES(Model ${PROJECT_LIBRARIES})
INCLUDE_DIRECTORIES(