X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FCMakeLists.txt;h=a5138d2fa25b72f3bc6fbae5c484277bc0b92ff3;hb=c57b0044525edb117d2b10cca0a931eecb5681f5;hp=36eb50535c28d59d7ebcaeee82e43342c7c8f905;hpb=f8c36784f4699f0e3d04f4e8e067c7bd317b4a1c;p=modules%2Fshaper.git

diff --git a/src/Model/CMakeLists.txt b/src/Model/CMakeLists.txt
index 36eb50535..a5138d2fa 100644
--- a/src/Model/CMakeLists.txt
+++ b/src/Model/CMakeLists.txt
@@ -1,4 +1,22 @@
-## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+## Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+## See http:##www.salome-platform.org/ or
+## email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+##
 
 INCLUDE(Common)
 
@@ -10,28 +28,33 @@ SET(PROJECT_HEADERS
     Model_Session.h
     Model_Data.h
     Model_AttributeDouble.h
+    Model_AttributeDoubleArray.h
     Model_AttributeDocRef.h
     Model_AttributeReference.h
     Model_AttributeRefAttr.h
     Model_AttributeRefList.h
+    Model_AttributeRefAttrList.h
     Model_AttributeBoolean.h
     Model_AttributeIntArray.h
     Model_AttributeString.h
+    Model_AttributeStringArray.h
     Model_AttributeInteger.h
     Model_AttributeSelection.h
     Model_AttributeSelectionList.h
+    Model_AttributeTables.h
     Model_BodyBuilder.h
     Model_Events.h
     Model_Expression.h
     Model_Update.h
     Model_Validator.h
     Model_ResultBody.h
-    Model_ResultCompSolid.h
     Model_ResultConstruction.h
     Model_ResultPart.h
+    Model_ResultField.h
     Model_ResultGroup.h
     Model_ResultParameter.h
     Model_FeatureValidator.h
+    Model_AttributeValidator.h
 )
 
 SET(PROJECT_SOURCES
@@ -41,58 +64,68 @@ SET(PROJECT_SOURCES
     Model_Session.cpp
     Model_Data.cpp
     Model_AttributeDouble.cpp
+    Model_AttributeDoubleArray.cpp
     Model_AttributeDocRef.cpp
     Model_AttributeReference.cpp
     Model_AttributeRefAttr.cpp
     Model_AttributeRefList.cpp
+    Model_AttributeRefAttrList.cpp
     Model_AttributeBoolean.cpp
     Model_AttributeIntArray.cpp
     Model_AttributeString.cpp
+    Model_AttributeStringArray.cpp
     Model_AttributeInteger.cpp
     Model_AttributeSelection.cpp
     Model_AttributeSelectionList.cpp
+    Model_AttributeTables.cpp
     Model_BodyBuilder.cpp
     Model_Events.cpp
     Model_Expression.cpp
     Model_Update.cpp
     Model_Validator.cpp
     Model_ResultBody.cpp
-    Model_ResultCompSolid.cpp
     Model_ResultConstruction.cpp
     Model_ResultPart.cpp
+    Model_ResultField.cpp
     Model_ResultGroup.cpp
     Model_ResultParameter.cpp
     Model_FeatureValidator.cpp
+    Model_AttributeValidator.cpp
 )
 
 SET(PROJECT_LIBRARIES
-    ModelAPI 
-    Events 
-    Config 
+    ModelAPI
+    Events
+    Config
+    Selector
     GeomData
     GeomAPI
     GeomAlgoAPI
-    ${CAS_OCAF}
-    ${CAS_TKCAF}
-    ${CAS_SHAPE}
-    ${CAS_TKBO}
+    ModelGeomAlgo
+    ${OpenCASCADE_ApplicationFramework_LIBRARIES}
 )
-
-
-
-ADD_DEFINITIONS(-DMODEL_EXPORTS ${CAS_DEFINITIONS})
-ADD_LIBRARY(Model SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
-TARGET_LINK_LIBRARIES(Model ${PROJECT_LIBRARIES})
-
-INCLUDE_DIRECTORIES(
+SET(PROJECT_INCLUDES
   ../ModelAPI
   ../Events
   ../Config
+  ../Selector
   ../GeomData
   ../GeomDataAPI
   ../GeomAlgoAPI
   ../GeomAPI
-  ${CAS_INCLUDE_DIRS}
+  ../ModelGeomAlgo
+  ${OpenCASCADE_INCLUDE_DIR}
 )
 
-INSTALL(TARGETS Model DESTINATION bin)
+
+IF(TKTInspector)
+    ADD_DEFINITIONS(-DTINSPECTOR)
+ENDIF()
+
+ADD_DEFINITIONS(-DMODEL_EXPORTS ${OpenCASCADE_DEFINITIONS})
+ADD_LIBRARY(Model SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
+TARGET_LINK_LIBRARIES(Model ${PROJECT_LIBRARIES})
+
+INCLUDE_DIRECTORIES(${PROJECT_INCLUDES})
+
+INSTALL(TARGETS Model DESTINATION ${SHAPER_INSTALL_BIN})