X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FCMakeLists.txt;h=a5138d2fa25b72f3bc6fbae5c484277bc0b92ff3;hb=7cf6494a70682c435e4ac288f2625083f0d52321;hp=a737654e0b61bc060ac4fd81a2bb300e3c30bd77;hpb=7594526e5b2187473a10986d21e9df70b77b481e;p=modules%2Fshaper.git

diff --git a/src/Model/CMakeLists.txt b/src/Model/CMakeLists.txt
index a737654e0..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)
 
@@ -30,7 +48,6 @@ SET(PROJECT_HEADERS
     Model_Update.h
     Model_Validator.h
     Model_ResultBody.h
-    Model_ResultCompSolid.h
     Model_ResultConstruction.h
     Model_ResultPart.h
     Model_ResultField.h
@@ -38,7 +55,6 @@ SET(PROJECT_HEADERS
     Model_ResultParameter.h
     Model_FeatureValidator.h
     Model_AttributeValidator.h
-    Model_SelectionNaming.h
 )
 
 SET(PROJECT_SOURCES
@@ -68,7 +84,6 @@ SET(PROJECT_SOURCES
     Model_Update.cpp
     Model_Validator.cpp
     Model_ResultBody.cpp
-    Model_ResultCompSolid.cpp
     Model_ResultConstruction.cpp
     Model_ResultPart.cpp
     Model_ResultField.cpp
@@ -76,41 +91,38 @@ SET(PROJECT_SOURCES
     Model_ResultParameter.cpp
     Model_FeatureValidator.cpp
     Model_AttributeValidator.cpp
-    Model_SelectionNaming.cpp
 )
 
 SET(PROJECT_LIBRARIES
     ModelAPI
     Events
     Config
+    Selector
     GeomData
     GeomAPI
     GeomAlgoAPI
-    ${CAS_OCAF}
-    ${CAS_TKCAF}
-    ${CAS_SHAPE}
-    ${CAS_TKBO}
+    ModelGeomAlgo
+    ${OpenCASCADE_ApplicationFramework_LIBRARIES}
 )
 SET(PROJECT_INCLUDES
   ../ModelAPI
   ../Events
   ../Config
+  ../Selector
   ../GeomData
   ../GeomDataAPI
   ../GeomAlgoAPI
   ../GeomAPI
-  ${CAS_INCLUDE_DIRS}
+  ../ModelGeomAlgo
+  ${OpenCASCADE_INCLUDE_DIR}
 )
 
 
-IF(DFBrowserAPI)
-    SET(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${DFBrowserAPI})
-    SET(PROJECT_INCLUDES ${PROJECT_INCLUDES} ${DFBROWSER_INCLUDE_DIR})
-
-    ADD_DEFINITIONS(-DDFBROWSER)
+IF(TKTInspector)
+    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})