Merge branch 'Dev_0.6.1' of newgeom:newgeom into Dev_0.6.1

[modules/shaper.git] / src / Model / CMakeLists.txt

diff --git a/src/Model/CMakeLists.txt b/src/Model/CMakeLists.txt
index c9715ebc2fc95683283cd4f0ff189ae166504ecb..379fc69afe1c6f9f664f729f6b77b5fb352b33e3 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
@@ -15,12 +17,14 @@ SET(PROJECT_HEADERS
     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_ResultGroup.h
     Model_FeatureValidator.h
 )
 
@@ -38,12 +42,14 @@ SET(PROJECT_SOURCES
     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_ResultGroup.cpp
     Model_FeatureValidator.cpp
 )
 
@@ -53,6 +59,7 @@ SET(PROJECT_LIBRARIES
     Config 
     GeomData
     GeomAPI
+    GeomAlgoAPI
     ${CAS_OCAF}
     ${CAS_TKCAF}
     ${CAS_SHAPE}
@@ -61,8 +68,8 @@ SET(PROJECT_LIBRARIES
 
 
 
-ADD_DEFINITIONS(-DMODEL_EXPORTS ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS})
-ADD_LIBRARY(Model SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
+ADD_DEFINITIONS(-DMODEL_EXPORTS ${CAS_DEFINITIONS})
+ADD_LIBRARY(Model MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS})
 TARGET_LINK_LIBRARIES(Model ${PROJECT_LIBRARIES})
 
 INCLUDE_DIRECTORIES(
@@ -71,6 +78,7 @@ INCLUDE_DIRECTORIES(
   ../Config
   ../GeomData
   ../GeomDataAPI
+  ../GeomAlgoAPI
   ../GeomAPI
   ${CAS_INCLUDE_DIRS}
 )