Some debugs in GUI

diff --git a/src/MEDGUI/CMakeLists.txt b/src/MEDGUI/CMakeLists.txt
index 1eade37d6f6215946f706ad4f4c1c4cd2bb5a8a7..eabf6989e5b6718df71931282dcd5e1779aec0a3 100644 (file)
--- a/src/MEDGUI/CMakeLists.txt
+++ b/src/MEDGUI/CMakeLists.txt
@@ -63,4 +63,4 @@ SET(MEDGUITS_SOURCES
 ADD_LIBRARY(MEDGUI SHARED ${MEDGUI_SOURCES} ${MEDGUI_HEADERS_MOC} ${MEDGUI_FORMS_HEADERS})
 TARGET_LINK_LIBRARIES(MEDGUI medcalculator ${QT_MT_LIBS} ${CAS_KERNEL} ${BOOST_LIBRARIES} ${GUI_LDFLAGS} ${SalomeApp} ${CAM} ${LightApp} ${qtx} ${suit} ${SalomeObject} ${PLATFORM_LIBS} ${SalomeLifeCycleCORBA})
 INSTALL(TARGETS MEDGUI DESTINATION ${SALOME_INSTALL_LIBS})
-QT4_INSTALL_TS_RESOURCES("${MEDGUITS_SOURCES}" "${MED_salomeres_DATA}")
+QT4_INSTALL_TS_RESOURCES("${MEDGUITS_SOURCES}" "${SALOME_MED_INSTALL_RES_DATA}")

diff --git a/src/MEDOP/gui/CMakeLists.txt b/src/MEDOP/gui/CMakeLists.txt
index c3bd78f1fc99c100f67bfe7d934c89860d8abec7..3a200d318a234bed5c8d3da30cacbb903854c890 100644 (file)
--- a/src/MEDOP/gui/CMakeLists.txt
+++ b/src/MEDOP/gui/CMakeLists.txt
@@ -93,7 +93,7 @@ ENDIF(WITH_MEDMEMGUI)
 TARGET_LINK_LIBRARIES(MEDOPGUI ${COMMON_FLAGS})
 
 INSTALL(TARGETS MEDOPGUI DESTINATION ${SALOME_INSTALL_LIBS})
-QT4_INSTALL_TS_RESOURCES("${MEDOPGUITS_SOURCES}" "${MED_salomeres_DATA}")
+QT4_INSTALL_TS_RESOURCES("${MEDOPGUITS_SOURCES}" "${SALOME_MED_INSTALL_RES_DATA}")
 
 FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
 INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})

diff --git a/src/MEDOP/res/CMakeLists.txt b/src/MEDOP/res/CMakeLists.txt
index fd4ff0353890217c95cd83c47e8d24ed61484843..c7532264ba281b0ab0417e6af1562bead6d07084 100644 (file)
--- a/src/MEDOP/res/CMakeLists.txt
+++ b/src/MEDOP/res/CMakeLists.txt
@@ -19,7 +19,7 @@
 
 ADD_SUBDIRECTORY(testfiles)
 
-IF(MED_ENABLE_GUI)
+IF(SALOME_BUILD_GUI)
   SET(MED_RESOURCES_FILES
     datasource_add.png
     datasource_changeUnderlyingMesh.png
@@ -37,5 +37,5 @@ IF(MED_ENABLE_GUI)
     workspace_clean.png
     workspace_save.png
     )
-  INSTALL(FILES ${MED_RESOURCES_FILES} DESTINATION ${MED_salomeres_DATA})
-ENDIF(MED_ENABLE_GUI)
+  INSTALL(FILES ${MED_RESOURCES_FILES} DESTINATION ${SALOME_MED_INSTALL_RES_DATA})
+ENDIF(SALOME_BUILD_GUI)