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
correction des valeurs
[modules/smesh.git]
/
src
/
SMESHClient
/
CMakeLists.txt
diff --git
a/src/SMESHClient/CMakeLists.txt
b/src/SMESHClient/CMakeLists.txt
index 7a7b4e92e5b8674c80e1683d1d3ee1ab1e6bfb57..ec16456969e85f6c4d571818277c4cb2ffc722b1 100644
(file)
--- a/
src/SMESHClient/CMakeLists.txt
+++ b/
src/SMESHClient/CMakeLists.txt
@@
-1,9
+1,9
@@
-# Copyright (C) 2012-20
13
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-20
21
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
#
# 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
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-24,8
+24,7
@@
INCLUDE_DIRECTORIES(
${MEDFILE_INCLUDE_DIRS}
${GEOM_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${MEDFILE_INCLUDE_DIRS}
${GEOM_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
- ${VTK_INCLUDE_DIRS}
- ${CAS_INCLUDE_DIRS}
+ ${OpenCASCADE_INCLUDE_DIR}
${OMNIORB_INCLUDE_DIR}
${PROJECT_SOURCE_DIR}/src/Controls
${PROJECT_SOURCE_DIR}/src/Driver
${OMNIORB_INCLUDE_DIR}
${PROJECT_SOURCE_DIR}/src/Controls
${PROJECT_SOURCE_DIR}/src/Driver
@@
-37,13
+36,14
@@
INCLUDE_DIRECTORIES(
${PROJECT_SOURCE_DIR}/src/SMESHDS
${PROJECT_SOURCE_DIR}/src/SMESH
${PROJECT_SOURCE_DIR}/src/SMESHUtils
${PROJECT_SOURCE_DIR}/src/SMESHDS
${PROJECT_SOURCE_DIR}/src/SMESH
${PROJECT_SOURCE_DIR}/src/SMESHUtils
+ ${PROJECT_SOURCE_DIR}/src/SMESH_I
${PROJECT_BINARY_DIR}/idl
)
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
${OMNIORB_DEFINITIONS}
${PROJECT_BINARY_DIR}/idl
)
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
${OMNIORB_DEFINITIONS}
- ${
CAS
_DEFINITIONS}
+ ${
OpenCASCADE
_DEFINITIONS}
${BOOST_DEFINITIONS}
)
${BOOST_DEFINITIONS}
)
@@
-64,15
+64,14
@@
SET(_link_LIBRARIES
${KERNEL_SALOMELocalTrace}
${GEOM_NMTDS}
${GEOM_SalomeIDLGEOM}
${KERNEL_SALOMELocalTrace}
${GEOM_NMTDS}
${GEOM_SalomeIDLGEOM}
- ${
CAS
_KERNEL}
+ ${
OpenCASCADE
_KERNEL}
SalomeIDLSMESH
SMDS
SMESHimpl
SMESHDS
SMESHControls
SalomeIDLSMESH
SMDS
SMESHimpl
SMESHDS
SMESHControls
+ SMESHEngine
MEDWrapper
MEDWrapper
- MEDWrapperBase
- MEDWrapper_V2_2
)
# --- headers ---
)
# --- headers ---
@@
-89,19
+88,11
@@
SET(SMESHClient_SOURCES
SMESH_Client.cxx
)
SMESH_Client.cxx
)
-# bin programs
-SET(SMESHClientBin_SOURCES
- SMESHClientBin.cxx
-)
-
# --- rules ---
ADD_LIBRARY(SMESHClient ${SMESHClient_SOURCES})
TARGET_LINK_LIBRARIES(SMESHClient ${_link_LIBRARIES} )
INSTALL(TARGETS SMESHClient EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
# --- rules ---
ADD_LIBRARY(SMESHClient ${SMESHClient_SOURCES})
TARGET_LINK_LIBRARIES(SMESHClient ${_link_LIBRARIES} )
INSTALL(TARGETS SMESHClient EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
-ADD_EXECUTABLE(SMESHClientBin ${SMESHClientBin_SOURCES})
-TARGET_LINK_LIBRARIES(SMESHClientBin ${_link_LIBRARIES})
-INSTALL(TARGETS SMESHClientBin EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})
INSTALL(FILES ${SMESHClient_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
INSTALL(FILES ${SMESHClient_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})