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
bos #24009 Merge gni/adaptation branch (MG-Adapt)
[modules/smesh.git]
/
src
/
SMESH
/
CMakeLists.txt
diff --git
a/src/SMESH/CMakeLists.txt
b/src/SMESH/CMakeLists.txt
index 95a1d3fd000c4a9b1ebd62f7d5395245038b4627..ad34d18d8806e53098880a77759757f06aaa775f 100644
(file)
--- a/
src/SMESH/CMakeLists.txt
+++ b/
src/SMESH/CMakeLists.txt
@@
-38,6
+38,7
@@
INCLUDE_DIRECTORIES(
${PROJECT_SOURCE_DIR}/src/SMDS
${PROJECT_SOURCE_DIR}/src/SMESHDS
${PROJECT_SOURCE_DIR}/src/SMESHUtils
${PROJECT_SOURCE_DIR}/src/SMDS
${PROJECT_SOURCE_DIR}/src/SMESHDS
${PROJECT_SOURCE_DIR}/src/SMESHUtils
+ ${MEDCOUPLING_INCLUDE_DIRS}
)
# additional preprocessor / compiler flags
)
# additional preprocessor / compiler flags
@@
-67,6
+68,7
@@
SET(_link_LIBRARIES
MeshDriverUNV
MeshDriverGMF
${DriverCGNS_LIB}
MeshDriverUNV
MeshDriverGMF
${DriverCGNS_LIB}
+ ${MEDCoupling_medloader}
)
# --- headers ---
)
# --- headers ---
@@
-86,6
+88,7
@@
SET(SMESHimpl_HEADERS
SMESH_MesherHelper.hxx
SMESH_ProxyMesh.hxx
SMESH_SMESH.hxx
SMESH_MesherHelper.hxx
SMESH_ProxyMesh.hxx
SMESH_SMESH.hxx
+ MG_ADAPT.hxx
)
# --- sources ---
)
# --- sources ---
@@
-104,13
+107,15
@@
SET(SMESHimpl_SOURCES
SMESH_HypoFilter.cxx
SMESH_ProxyMesh.cxx
SMESH_MesherHelper.cxx
SMESH_HypoFilter.cxx
SMESH_ProxyMesh.cxx
SMESH_MesherHelper.cxx
+ MG_ADAPT.cxx
)
# --- rules ---
ADD_LIBRARY(SMESHimpl ${SMESHimpl_SOURCES})
IF(WIN32)
)
# --- rules ---
ADD_LIBRARY(SMESHimpl ${SMESHimpl_SOURCES})
IF(WIN32)
- TARGET_COMPILE_OPTIONS(SMESHimpl PRIVATE /bigobj)
+ TARGET_COMPILE_OPTIONS(SMESHimpl PRIVATE /bigobj)
+ ADD_DEFINITIONS(-DNOMINMAX)
ENDIF(WIN32)
TARGET_LINK_LIBRARIES(SMESHimpl ${_link_LIBRARIES} )
ENDIF(WIN32)
TARGET_LINK_LIBRARIES(SMESHimpl ${_link_LIBRARIES} )