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
/
CMakeLists.txt
diff --git
a/src/CMakeLists.txt
b/src/CMakeLists.txt
old mode 100755
(executable)
new mode 100644
(file)
index
6ed1140
..
7fb5fc4
--- a/
src/CMakeLists.txt
+++ b/
src/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
@@
-42,15
+42,11
@@
SET(SUBDIRS_COMMON
Tools
)
Tools
)
-IF(SALOME_SMESH_ENABLE_MEFISTO)
- SET(SUBDIRS_MEFISTO2 MEFISTO2)
-ENDIF(SALOME_SMESH_ENABLE_MEFISTO)
-
##
# CGNS
##
IF(SALOME_SMESH_USE_CGNS)
##
# CGNS
##
IF(SALOME_SMESH_USE_CGNS)
- SET(SUBDIRS_CGNS
+ SET(SUBDIRS_CGNS
DriverCGNS
)
ENDIF(SALOME_SMESH_USE_CGNS)
DriverCGNS
)
ENDIF(SALOME_SMESH_USE_CGNS)
@@
-59,9
+55,9
@@
ENDIF(SALOME_SMESH_USE_CGNS)
# GUI
##
IF(SALOME_BUILD_GUI)
# GUI
##
IF(SALOME_BUILD_GUI)
- SET(SUBDIRS_GUI OBJECT
- SMESHFiltersSelection
- SMESHGUI
+ SET(SUBDIRS_GUI OBJECT
+ SMESHFiltersSelection
+ SMESHGUI
PluginUtils
SMESH_SWIG_WITHIHM
StdMeshersGUI
PluginUtils
SMESH_SWIG_WITHIHM
StdMeshersGUI
@@
-70,7
+66,6
@@
ENDIF(SALOME_BUILD_GUI)
SET(SUBDIRS
${SUBDIRS_COMMON}
SET(SUBDIRS
${SUBDIRS_COMMON}
- ${SUBDIRS_MEFISTO2}
${SUBDIRS_CGNS}
${SUBDIRS_GUI}
)
${SUBDIRS_CGNS}
${SUBDIRS_GUI}
)