From: bruneton <bruneton>
Date: Tue, 9 Jul 2013 13:06:43 +0000 (+0000)
Subject: CMake: fixing an installation path + de-activating MEDGUI temporarly
X-Git-Tag: B4KillOfAutomake~39
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0a74835e7288d9fe895c1e88e4db9f3f7f7a37ff;p=modules%2Fmed.git

CMake: fixing an installation path + de-activating MEDGUI temporarly
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 834518d3f..a01e295c2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -67,8 +67,8 @@ IF(SALOME_BUILD_GUI)
   IF(NOT SALOME_MED_STANDALONE)
     IF(NOT SALOME_MED_MICROMED)
       IF(SALOME_MED_ENABLE_PYTHON)
-	ADD_SUBDIRECTORY(MEDGUI)
-	ADD_SUBDIRECTORY(MEDOP)
+        #ADD_SUBDIRECTORY(MEDGUI)
+        ADD_SUBDIRECTORY(MEDOP)
       ENDIF(SALOME_MED_ENABLE_PYTHON)
     ENDIF(NOT SALOME_MED_MICROMED)
   ENDIF(NOT SALOME_MED_STANDALONE)
diff --git a/src/MEDOP/gui/CMakeLists.txt b/src/MEDOP/gui/CMakeLists.txt
index 4b812d489..a5095aac3 100644
--- a/src/MEDOP/gui/CMakeLists.txt
+++ b/src/MEDOP/gui/CMakeLists.txt
@@ -72,19 +72,18 @@ SET(COMMON_FLAGS
   SalomeIDLMED
   MEDOPGUI_dialogs
   MEDOPFactoryEngine
-  ${qtx}
-  ${suit}
-  ${SalomeObject}
-  ${SalomeLifeCycleCORBA}
-  ${SalomeKernelHelpers}
-  ${SalomeApp}
-  ${SalomeGuiHelpers}
-  ${SalomeTreeData}
-  ${OpUtil}
-  ${CAM}
-  ${LightApp}
-  ${PyConsole}
-  ${SalomeGuiHelpers}
+  ${GUI_qtx}
+  ${GUI_suit}
+  ${GUI_SalomeObject}
+  ${KERNEL_SalomeLifeCycleCORBA}
+  ${KERNEL_SalomeKernelHelpers}
+  ${GUI_SalomeApp}
+  ${GUI_SalomeGuiHelpers}
+  ${GUI_SalomeTreeData}
+  ${KERNEL_OpUtil}
+  ${GUI_CAM}
+  ${GUI_LightApp}
+  ${GUI_PyConsole}
 )
 
 ADD_LIBRARY(MEDOPGUI SHARED ${MEDOPGUI_SOURCES} ${MEDOPGUI_HEADERS_MOC})
diff --git a/src/MEDOP/tui/xmedpy/CMakeLists.txt b/src/MEDOP/tui/xmedpy/CMakeLists.txt
index 55c85452f..5017c3eee 100644
--- a/src/MEDOP/tui/xmedpy/CMakeLists.txt
+++ b/src/MEDOP/tui/xmedpy/CMakeLists.txt
@@ -32,7 +32,7 @@ SET(PYFILES_TO_INSTALL
   properties.py
   )
 
-INSTALL_AND_COMPILE_PYTHON_FILE("${PYFILES_TO_INSTALL}" ${MED_salomepythondir}/xmed)
+INSTALL_AND_COMPILE_PYTHON_FILE("${PYFILES_TO_INSTALL}" ${SALOME_INSTALL_PYTHON}/xmed)
 
 SET(TEST_SCRIPTS_XMED
   tests/test_xmed_fieldOperations.py