X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOM_I%2FCMakeLists.txt;h=35c1e58c2922067f4d558dc036405cb98c6a3348;hb=25a3dc91508bb59688142bc616b10facc61dfc3d;hp=b768384026c3fac2ef633d5d59e11baa0c4682e8;hpb=e7b562779c514770fa1702c436aef108ed4b6da5;p=modules%2Fgeom.git

diff --git a/src/GEOM_I/CMakeLists.txt b/src/GEOM_I/CMakeLists.txt
old mode 100755
new mode 100644
index b76838402..35c1e58c2
--- a/src/GEOM_I/CMakeLists.txt
+++ b/src/GEOM_I/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2021  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,11 +22,14 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR}
-  ${CAS_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   ${PROJECT_SOURCE_DIR}/src/GEOMImpl
   ${PROJECT_SOURCE_DIR}/src/GEOM
   ${PROJECT_SOURCE_DIR}/src/GEOMAlgo
+  ${PROJECT_SOURCE_DIR}/src/GEOMUtils
+  ${PROJECT_SOURCE_DIR}/src/ShHealOper
   ${PROJECT_BINARY_DIR}/idl
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${PROJECT_BINARY_DIR}
@@ -34,46 +37,59 @@ INCLUDE_DIRECTORIES(
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
   )
 
+IF(WIN32)
+  ADD_DEFINITIONS(-DNOGDI)
+ENDIF(WIN32)
+
 # libraries to link to
 SET(_link_LIBRARIES
   GEOMImpl
+  GEOMUtils
   SalomeIDLGEOM
   ${KERNEL_SALOMELocalTrace}
   ${KERNEL_SalomeGenericObj}
   ${KERNEL_TOOLSDS}
   ${KERNEL_SalomeContainer}
   ${KERNEL_SalomeNS}
+  ${KERNEL_SalomeDS}
   )
 
 # --- headers ---
 
 SET(GEOMEngine_HEADERS
-  # GEOM_Object_i.hh
-  # GEOM_IOperations_i.hh
-  # GEOM_IBasicOperations_i.hh
-  # GEOM_IHealingOperations_i.hh
-  # GEOM_I3DPrimOperations_i.hh
-  # GEOM_IShapesOperations_i.hh
-  # GEOM_IBlocksOperations_i.hh
-  # GEOM_IBooleanOperations_i.hh
-  # GEOM_ICurvesOperations_i.hh
-  # GEOM_ILocalOperations_i.hh
-  # GEOM_IInsertOperations_i.hh
-  # GEOM_ITransformOperations_i.hh
-  # GEOM_IMeasureOperations_i.hh
-  # GEOM_IGroupOperations_i.hh
-  # GEOM_Gen_i.hh
-  # GEOM_GEOM_I.hxx
+  GEOM_IFieldOperations_i.hh
+  GEOM_BaseObject_i.hh
+  GEOM_Object_i.hh
+  GEOM_IOperations_i.hh
+  GEOM_IBasicOperations_i.hh
+  GEOM_IHealingOperations_i.hh
+  GEOM_I3DPrimOperations_i.hh
+  GEOM_IShapesOperations_i.hh
+  GEOM_IBlocksOperations_i.hh
+  GEOM_IBooleanOperations_i.hh
+  GEOM_ICurvesOperations_i.hh
+  GEOM_ILocalOperations_i.hh
+  GEOM_IInsertOperations_i.hh
+  GEOM_ITransformOperations_i.hh
+  GEOM_IMeasureOperations_i.hh
+  GEOM_IGroupOperations_i.hh
+  GEOM_Gen_i.hh
+  GEOM_Gen_Session_i.hh
+  GEOM_Gen_No_Session_i.hh
+  GEOM_GEOM_I.hxx
   GEOM_wrap.hxx
+  GEOM_Component_Generator.hxx
   )
 # --- sources ---
 
 SET(GEOMEngine_SOURCES
+  GEOM_BaseObject_i.cc
   GEOM_Object_i.cc
+  GEOM_Field_i.cc
   GEOM_IOperations_i.cc
   GEOM_IBasicOperations_i.cc
   GEOM_IHealingOperations_i.cc
@@ -87,8 +103,12 @@ SET(GEOMEngine_SOURCES
   GEOM_ITransformOperations_i.cc
   GEOM_IMeasureOperations_i.cc
   GEOM_IGroupOperations_i.cc
+  GEOM_IFieldOperations_i.cc
   GEOM_Gen_i.cc
+  GEOM_Gen_Session_i.cc
+  GEOM_Gen_No_Session_i.cc
   GEOM_DumpPython.cc
+  GEOM_Component_Generator.cxx
   )
 
 # --- rules ---
@@ -97,4 +117,4 @@ ADD_LIBRARY(GEOMEngine ${GEOMEngine_SOURCES})
 TARGET_LINK_LIBRARIES(GEOMEngine ${_link_LIBRARIES})
 INSTALL(TARGETS GEOMEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
-INSTALL(FILES ${GEOMEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
\ No newline at end of file
+INSTALL(FILES ${GEOMEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})