X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOM%2FCMakeLists.txt;h=cab853a264ea189e9fd8a4a55da4a727689c4750;hb=d617faae6bc5aeb91b63796618a20c7c13037b6c;hp=d71cf09672a60759a109139b791ec739d8ee86e5;hpb=824e67eabf31204b2bb910e52d7f9e8e1eab140c;p=modules%2Fgeom.git diff --git a/src/GEOM/CMakeLists.txt b/src/GEOM/CMakeLists.txt old mode 100755 new mode 100644 index d71cf0967..cab853a26 --- 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-2023 CEA, EDF, 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 @@ -21,7 +21,7 @@ # additional include directories INCLUDE_DIRECTORIES( - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src/SKETCHER @@ -30,16 +30,14 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ) # libraries to link to SET(_link_LIBRARIES - ${CAS_OCAFVIS} - ${CAS_TKLCAF} - ${CAS_TKCDF} - ${CAS_TKG3d} + ${OpenCASCADE_ApplicationFramework_LIBRARIES} ${OpenCASCADE_ModelingData_LIBRARIES} ${KERNEL_SALOMELocalTrace} + ${KERNEL_OpUtil} GEOMSketcher ) @@ -47,22 +45,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 --- @@ -71,15 +65,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 ---