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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 834518d3fd966b4dd33f6c30e980589e98770be7..a01e295c27667ba4c240c510c23bd716bd794444 100644 (file)
--- 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 4b812d48905b4eaae8d50fc8c080ed5c81077210..a5095aac3416cfa778d5523632f39d7942415d1d 100644 (file)
--- 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 55c85452f832cb0e6782b390f256e5d7d7fd22d6..5017c3eeefab5830a6c0804ecc4d0bf5ac4d4217 100644 (file)
--- 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