Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'V9_11_BR'
[modules/geom.git]
/
src
/
GEOM
/
CMakeLists.txt
diff --git
a/src/GEOM/CMakeLists.txt
b/src/GEOM/CMakeLists.txt
old mode 100755
(executable)
new mode 100644
(file)
index
0670561
..
cab853a
--- a/
src/GEOM/CMakeLists.txt
+++ b/
src/GEOM/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-20
14 CEA/DEN, EDF R&D
, OPEN CASCADE
+# Copyright (C) 2012-20
23 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
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-21,7
+21,7
@@
# additional include directories
INCLUDE_DIRECTORIES(
# additional include directories
INCLUDE_DIRECTORIES(
- ${
CAS_INCLUDE_DIRS
}
+ ${
OpenCASCADE_INCLUDE_DIR
}
${PTHREAD_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/SKETCHER
${PTHREAD_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/SKETCHER
@@
-30,15
+30,12
@@
INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
- ${
CAS
_DEFINITIONS}
+ ${
OpenCASCADE
_DEFINITIONS}
)
# libraries to link to
SET(_link_LIBRARIES
)
# 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
${KERNEL_SALOMELocalTrace}
${KERNEL_OpUtil}
GEOMSketcher
@@
-48,9
+45,6
@@
SET(_link_LIBRARIES
SET(GEOM_HEADERS
GEOM_Application.hxx
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_Engine.hxx
GEOM_Function.hxx
GEOM_Object.hxx
@@
-61,10
+55,8
@@
SET(GEOM_HEADERS
GEOM_ISubShape.hxx
GEOM_Solver.hxx
GEOM_PythonDump.hxx
GEOM_ISubShape.hxx
GEOM_Solver.hxx
GEOM_PythonDump.hxx
- GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx
- GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx
GEOM_DataMapOfAsciiStringTransient.hxx
GEOM_DataMapOfAsciiStringTransient.hxx
-
Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransien
t.hxx
+
GEOM_BaseObjec
t.hxx
)
# --- sources ---
)
# --- sources ---
@@
-81,9
+73,6
@@
SET(GEOM_SOURCES
GEOM_BaseDriver.cxx
GEOM_SubShapeDriver.cxx
GEOM_PythonDump.cxx
GEOM_BaseDriver.cxx
GEOM_SubShapeDriver.cxx
GEOM_PythonDump.cxx
- GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx
- GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_0.cxx
- GEOM_DataMapOfAsciiStringTransient_0.cxx
)
# --- rules ---
)
# --- rules ---