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 'master' into gni/adaptation
[modules/smesh.git]
/
src
/
SMESHGUI
/
CMakeLists.txt
diff --git
a/src/SMESHGUI/CMakeLists.txt
b/src/SMESHGUI/CMakeLists.txt
index c0252dca40f9d7d64415d54da8940ec6cefa2ad5..f4fa5526dd37ea88117259e0a7eb29f2287563ba 100644
(file)
--- a/
src/SMESHGUI/CMakeLists.txt
+++ b/
src/SMESHGUI/CMakeLists.txt
@@
-42,9
+42,14
@@
INCLUDE_DIRECTORIES(
${PROJECT_SOURCE_DIR}/src/Controls
${PROJECT_SOURCE_DIR}/src/SMESHClient
${PROJECT_SOURCE_DIR}/src/MEDWrapper
${PROJECT_SOURCE_DIR}/src/Controls
${PROJECT_SOURCE_DIR}/src/SMESHClient
${PROJECT_SOURCE_DIR}/src/MEDWrapper
+ ${PROJECT_SOURCE_DIR}/src/ADAPT
+ ${PROJECT_SOURCE_DIR}/src/ADAPT_I
${PROJECT_SOURCE_DIR}/src/ADAPTGUI
${PROJECT_BINARY_DIR}
${PROJECT_BINARY_DIR}/idl
${PROJECT_SOURCE_DIR}/src/ADAPTGUI
${PROJECT_BINARY_DIR}
${PROJECT_BINARY_DIR}/idl
+ ${PROJECT_BINARY_DIR}/src/ADAPTGUI
+ ${PROJECT_BINARY_DIR}/src/ADAPT_I
+ ${MEDCOUPLING_INCLUDE_DIRS}
)
# additional preprocessor / compiler flags
)
# additional preprocessor / compiler flags
@@
-74,6
+79,10
@@
SET(_link_LIBRARIES
SMDS
SMESHControls
SMESHObject
SMDS
SMESHControls
SMESHObject
+ ADAPTGUI
+ ADAPTImpl
+ ADAPTEngine
+ ${MEDCoupling_medloader}
)
# --- headers ---
)
# --- headers ---
@@
-146,6
+155,9
@@
SET(_moc_HEADERS
SMESHGUI_SplitBiQuad.h
SMESHGUI_IdPreview.h
SMESHGUI_PreVisualObj.h
SMESHGUI_SplitBiQuad.h
SMESHGUI_IdPreview.h
SMESHGUI_PreVisualObj.h
+ SMESHGUI_AdaptDlg.h
+ SMESHGUI_MG_ADAPTDRIVER.h
+ MG_ADAPTGUI.hxx # to replace in ../ADAPTGUI/
)
# header files / no moc processing
)
# header files / no moc processing
@@
-168,6
+180,7
@@
SET(_other_HEADERS
SMESHGUI_FileValidator.h
SMESHGUI_SelectionProxy.h
SMESH_SMESHGUI.hxx
SMESHGUI_FileValidator.h
SMESHGUI_SelectionProxy.h
SMESH_SMESHGUI.hxx
+ #~MG_ADAPT.hxx # to replace in ../ADAPT/
)
# header files / to install
)
# header files / to install
@@
-261,6
+274,10
@@
SET(_other_SOURCES
SMESHGUI_SplitBiQuad.cxx
SMESHGUI_PreVisualObj.cxx
SMESHGUI_IdPreview.cxx
SMESHGUI_SplitBiQuad.cxx
SMESHGUI_PreVisualObj.cxx
SMESHGUI_IdPreview.cxx
+ SMESHGUI_AdaptDlg.cxx
+ SMESHGUI_MG_ADAPTDRIVER.cxx
+ MG_ADAPTGUI.cxx # to replace in ../ADAPTGUI/
+ #MG_ADAPT.cxx
)
# sources / to compile
)
# sources / to compile
@@
-274,7
+291,7
@@
SET(_ts_RESOURCES
SMESH_msg_en.ts
SMESH_msg_fr.ts
SMESH_msg_ja.ts
SMESH_msg_en.ts
SMESH_msg_fr.ts
SMESH_msg_ja.ts
-)
+)
# --- rules ---
# --- rules ---