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 59f09da98a0b5b8d37f5a660486768b9491c8e46..237f63801af93a9f2685296bf3e33412b340e579 100644 (file)
--- a/src/SMESHGUI/CMakeLists.txt
+++ b/src/SMESHGUI/CMakeLists.txt
@@ -42,12 +42,8 @@ INCLUDE_DIRECTORIES(
   ${PROJECT_SOURCE_DIR}/src/Controls
   ${PROJECT_SOURCE_DIR}/src/SMESHClient
   ${PROJECT_SOURCE_DIR}/src/MEDWrapper
-  ${PROJECT_SOURCE_DIR}/src/ADAPT
-  ${PROJECT_SOURCE_DIR}/src/ADAPTGUI
   ${PROJECT_BINARY_DIR}
   ${PROJECT_BINARY_DIR}/idl
-  ${PROJECT_BINARY_DIR}/src/ADAPTGUI
-  ${PROJECT_BINARY_DIR}/src/ADAPT
   ${MEDCOUPLING_INCLUDE_DIRS}
 )
 
@@ -78,9 +74,6 @@ SET(_link_LIBRARIES
   SMDS
   SMESHControls
   SMESHObject
-  ADAPTGUI
-  ADAPTImpl
-  ADAPTEngine
   ${MEDCoupling_medloader}
 )
 
@@ -156,7 +149,7 @@ SET(_moc_HEADERS
   SMESHGUI_PreVisualObj.h
   SMESHGUI_AdaptDlg.h
   SMESHGUI_MG_ADAPTDRIVER.h
-  #~MG_ADAPTGUI.hxx # to replace in ../ADAPTGUI/
+  MG_ADAPTGUI.hxx # to replace in ../ADAPTGUI/
 )
 
 # header files / no moc processing
@@ -275,7 +268,7 @@ SET(_other_SOURCES
   SMESHGUI_IdPreview.cxx
   SMESHGUI_AdaptDlg.cxx
   SMESHGUI_MG_ADAPTDRIVER.cxx
-  #~MG_ADAPTGUI.cxx # to replace in ../ADAPTGUI/
+  MG_ADAPTGUI.cxx # to replace in ../ADAPTGUI/
   #MG_ADAPT.cxx
 )