Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'OCCT780'
[modules/smesh.git]
/
src
/
DriverSTL
/
CMakeLists.txt
diff --git
a/src/DriverSTL/CMakeLists.txt
b/src/DriverSTL/CMakeLists.txt
index 53aef6ea33c9e82014f4787f99b83b53fa68d55d..ef95a3698a62732245d68ea5a6b0e014678c63b1 100644
(file)
--- a/
src/DriverSTL/CMakeLists.txt
+++ b/
src/DriverSTL/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-20
16 CEA/DEN, EDF R&D
, OPEN CASCADE
+# Copyright (C) 2012-20
24 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,8
+21,7
@@
# additional include directories
INCLUDE_DIRECTORIES(
${KERNEL_INCLUDE_DIRS}
# additional include directories
INCLUDE_DIRECTORIES(
${KERNEL_INCLUDE_DIRS}
- ${CAS_INCLUDE_DIRS}
- ${VTK_INCLUDE_DIRS}
+ ${OpenCASCADE_INCLUDE_DIR}
${Boost_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/Driver
${PROJECT_SOURCE_DIR}/src/SMDS
${Boost_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/Driver
${PROJECT_SOURCE_DIR}/src/SMDS
@@
-32,16
+31,15
@@
INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
- ${
CAS
_DEFINITIONS}
+ ${
OpenCASCADE
_DEFINITIONS}
${BOOST_DEFINITIONS}
)
# libraries to link to
SET(_link_LIBRARIES
${BOOST_DEFINITIONS}
)
# libraries to link to
SET(_link_LIBRARIES
- ${CAS_TKernel}
- ${CAS_TKSTL}
- ${CAS_TKTopAlgo}
- ${CAS_TKMesh}
+ ${OpenCASCADE_FoundationClasses_LIBRARIES}
+ ${OpenCASCADE_DataExchange_LIBRARIES}
+ ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
${KERNEL_SALOMEBasics}
MeshDriver
SMDS
${KERNEL_SALOMEBasics}
MeshDriver
SMDS
@@
-53,11
+51,9
@@
SET(_link_LIBRARIES_bin
${KERNEL_SALOMELocalTrace}
${KERNEL_SALOMEBasics}
${KERNEL_SalomeIDLKERNEL}
${KERNEL_SALOMELocalTrace}
${KERNEL_SALOMEBasics}
${KERNEL_SalomeIDLKERNEL}
- ${CAS_TKernel}
- ${CAS_TKSTL}
- ${CAS_TKTopAlgo}
- ${CAS_TKMesh}
- ${CAS_TKBO}
+ ${OpenCASCADE_FoundationClasses_LIBRARIES}
+ ${OpenCASCADE_DataExchange_LIBRARIES}
+ ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
MeshDriver
SMDS
)
MeshDriver
SMDS
)