Merge V8_4_BR branch.

[modules/geom.git] / src / GEOM / CMakeLists.txt

diff --git a/src/GEOM/CMakeLists.txt b/src/GEOM/CMakeLists.txt
index c5bbf98236400140f03801f723243ef95776950b..9a34d081b15d3d749037303bff9b8ee354dea46f 100755 (executable)
--- a/src/GEOM/CMakeLists.txt
+++ b/src/GEOM/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # 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.
+# 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
@@ -22,6 +22,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   ${PROJECT_SOURCE_DIR}/src/SKETCHER
   ${CMAKE_CURRENT_SOURCE_DIR}
@@ -35,7 +36,14 @@ ADD_DEFINITIONS(
 # libraries to link to
 SET(_link_LIBRARIES
   ${CAS_OCAFVIS}
+  ${CAS_TKLCAF}
+  ${CAS_TKCDF}
+  ${CAS_TKG3d}
+  ${CAS_TKStdL}
+  ${CAS_TKStd}
+  ${CAS_TKBin}
   ${KERNEL_SALOMELocalTrace}
+  ${KERNEL_OpUtil}
   GEOMSketcher
   )
 
@@ -43,22 +51,18 @@ SET(_link_LIBRARIES
 
 SET(GEOM_HEADERS
   GEOM_Application.hxx
-  GEOM_Application.ixx
-  GEOM_Application.jxx
-  Handle_GEOM_Application.hxx
   GEOM_Engine.hxx
   GEOM_Function.hxx
   GEOM_Object.hxx
+  GEOM_Field.hxx
   GEOM_BaseDriver.hxx
   GEOM_SubShapeDriver.hxx
   GEOM_IOperations.hxx
   GEOM_ISubShape.hxx
   GEOM_Solver.hxx
   GEOM_PythonDump.hxx
-  GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx
-  GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx
   GEOM_DataMapOfAsciiStringTransient.hxx
-  Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx
+  GEOM_BaseObject.hxx
   )
 
 # --- sources ---
@@ -67,15 +71,14 @@ SET(GEOM_SOURCES
   GEOM_Application.cxx
   GEOM_Engine.cxx
   GEOM_Function.cxx
+  GEOM_BaseObject.cxx
   GEOM_Object.cxx
+  GEOM_Field.cxx
   GEOM_IOperations.cxx
   GEOM_Solver.cxx
   GEOM_BaseDriver.cxx
   GEOM_SubShapeDriver.cxx
   GEOM_PythonDump.cxx
-  GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx
-  GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_0.cxx
-  GEOM_DataMapOfAsciiStringTransient_0.cxx
   )
 
 # --- rules ---