From e48a18b261c8ca83190b2b449060c2f315ca9fe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9rald=20NICOLAS?= <gerald.nicolas@edf.fr>
Date: Wed, 20 May 2020 17:54:52 +0200
Subject: [PATCH] =?UTF-8?q?compl=C3=A9ments?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/ADAPTGUI/CMakeLists.txt | 54 ++++++++++++++++++-------------------
 src/ADAPT_I/CMakeLists.txt  | 11 +++++---
 2 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/src/ADAPTGUI/CMakeLists.txt b/src/ADAPTGUI/CMakeLists.txt
index 54cb7d0ff..700628787 100644
--- a/src/ADAPTGUI/CMakeLists.txt
+++ b/src/ADAPTGUI/CMakeLists.txt
@@ -54,36 +54,10 @@ SET(_link_LIBRARIES
   ${KERNEL_SalomeLifeCycleCORBA}
   ${KERNEL_SalomeDS}
   ${GUI_SalomeApp}
-  SalomeIDLADAPT
+  ${SMESH_SalomeIDLSMESH}
   ADAPTEngine
 )
 
-# --- resources ---
-
-# resource files / to be processed by lrelease
-SET(_ts_RESOURCES
-  ADAPT_msg_en.ts
-  ADAPT_msg_fr.ts
-  ADAPT_msg_ja.ts
-)
-
-# resource files / to be processed by uic
-SET(_uic_FILES
-  CreateBoundaryCAO.ui
-  CreateBoundaryAn.ui
-  CreateBoundaryDi.ui
-  CreateCase.ui
-  CreateHypothesis.ui
-  CreateIteration.ui
-  CreateListGroup.ui
-  CreateYACS.ui
-  CreateZone.ui
-  EditFile.ui
-  IterInfo.ui
-  MeshInfo.ui
-  PursueIteration.ui
-)
-
 # --- headers ---
 
 # header files / to be processed by moc
@@ -167,6 +141,32 @@ SET(_other_SOURCES
 # sources / to compile
 SET(ADAPT_SOURCES ${_other_SOURCES} ${_moc_SOURCES} ${_uic_HEADERS})
 
+# --- resources ---
+
+# resource files / to be processed by lrelease
+SET(_ts_RESOURCES
+  ADAPT_msg_en.ts
+  ADAPT_msg_fr.ts
+  ADAPT_msg_ja.ts
+)
+
+# resource files / to be processed by uic
+SET(_uic_FILES
+  CreateBoundaryCAO.ui
+  CreateBoundaryAn.ui
+  CreateBoundaryDi.ui
+  CreateCase.ui
+  CreateHypothesis.ui
+  CreateIteration.ui
+  CreateListGroup.ui
+  CreateYACS.ui
+  CreateZone.ui
+  EditFile.ui
+  IterInfo.ui
+  MeshInfo.ui
+  PursueIteration.ui
+)
+
 # --- rules ---
 
 ADD_LIBRARY(ADAPT ${ADAPT_SOURCES})
diff --git a/src/ADAPT_I/CMakeLists.txt b/src/ADAPT_I/CMakeLists.txt
index f571c2158..b569b1e3d 100644
--- a/src/ADAPT_I/CMakeLists.txt
+++ b/src/ADAPT_I/CMakeLists.txt
@@ -29,9 +29,14 @@ INCLUDE_DIRECTORIES(
   ${PROJECT_BINARY_DIR}
   ${PROJECT_BINARY_DIR}/idl
   ${PROJECT_BINARY_DIR}/adm_local/unix
-  ${PROJECT_SOURCE_DIR}/src/FrontTrack
+  ${PROJECT_SOURCE_DIR}/src/ADAPTFrontTrack
   ${PROJECT_SOURCE_DIR}/src/ADAPT
   ${PROJECT_SOURCE_DIR}/src/ADAPTGUI
+  ${PROJECT_SOURCE_DIR}/src/SMESH_I
+  ${PROJECT_SOURCE_DIR}/src/SMESH
+  ${PROJECT_SOURCE_DIR}/src/SMESHDS
+  ${PROJECT_SOURCE_DIR}/src/SMDS
+  ${PROJECT_SOURCE_DIR}/src/SMESHUtils
 )
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
@@ -50,9 +55,9 @@ SET(_link_LIBRARIES
   ${KERNEL_SalomeGenericObj}
   ${SMESH_SalomeIDLSMESH}
   ${SMESH_SMESHEngine}
-  FrontTrack
-  SalomeIDLADAPT
+  ADAPTFrontTrack
   ADAPTImpl
+  SMESHimpl
 )
 
 # --- headers ---