X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDOP%2Fgui%2FCMakeLists.txt;h=a87be78651f74b02f23ba30837b263d5ad3bc8c7;hb=576840fd5646d4b041c9fc1aefdeb08e257df960;hp=5958e600b2e52054cc5cf3e55eeed5a074694839;hpb=f1a947b32a36d8dc8e3079b25305bb50e8cb59a0;p=tools%2Fmedcoupling.git

diff --git a/src/MEDOP/gui/CMakeLists.txt b/src/MEDOP/gui/CMakeLists.txt
index 5958e600b..a87be7865 100644
--- a/src/MEDOP/gui/CMakeLists.txt
+++ b/src/MEDOP/gui/CMakeLists.txt
@@ -17,9 +17,14 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+ADD_DEFINITIONS(${MEDFILE_DEFINITIONS} ${XDR_DEFINITIONS} ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS} ${PLATFORM_DEFINITIONS} ${OMNIORB_DEFINITIONS})
+
+INCLUDE(${QT_USE_FILE})
+SET(QT_LIBS "${QT_LIBRARIES}")
+INCLUDE(UseQt4Ext)
+
 ADD_SUBDIRECTORY(dialogs)
 
-INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/UseQT4EXT.cmake)
 
 SET(MEDOPGUI_SOURCES
   MEDOPFactoryClient.cxx
@@ -37,7 +42,7 @@ SET(MEDOPGUI_HEADERS MEDOPModule.hxx MEDEventListener_i.hxx WorkspaceController.
 QT4_WRAP_CPP(MEDOPGUI_HEADERS_MOC ${MEDOPGUI_HEADERS})
 
 INCLUDE_DIRECTORIES(
-  ${OMNIORB_INCLUDE_DIRS}
+  ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
   ${CAS_INCLUDE_DIRS}
   ${BOOST_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIRS}
@@ -48,52 +53,47 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_BINARY_DIR}/dialogs
   ${CMAKE_CURRENT_SOURCE_DIR}/../cmp
   ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDGUI
-  ${CMAKE_BINARY_DIR}/idl
-  ${CMAKE_BINARY_DIR}
+  ${PROJECT_BINARY_DIR}/idl
+  ${PROJECT_BINARY_DIR}
 )
 
 SET(MEDOPGUITS_SOURCES
-  MEDOP_msg_en.ts
-  MEDOP_msg_fr.ts
+  MED_images.ts
+  MED_msg_en.ts
+  MED_msg_fr.ts
 )
-SET(COMMON_DEFINITIONS "${MED3_DEFINITIONS} ${XDR_DEFINITIONS} ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS} ${PLATFORM_DEFINITIONS} ${OMNIORB_DEFINITIONS}")
-SET(COMMON_FLAGS 
+
+SET(COMMON_FLAGS
   ${CAS_KERNEL}
-  ${QT_MT_LIBS} 
-  ${OMNIORB_LIBS} 
-  ${PLATFORM_LIBS} 
-  ${BOOST_LIBS}
-  SalomeIDLMED 
-  MEDOPGUI_dialogs 
-  MEDOPFactoryEngine 
-  ${qtx}
-  ${suit} 
-  ${SalomeObject}
-  ${SalomeLifeCycleCORBA} 
-  ${SalomeKernelHelpers} 
-  ${SalomeApp} 
-  ${SalomeGuiHelpers} 
-  ${SalomeTreeData} 
-  ${OpUtil}
-  ${CAM}
-  ${LightApp}
-  ${PyConsole}
-  ${SalomeGuiHelpers}
+  ${QT_MT_LIBRARIES}
+  ${OMNIORB_LIBRARIES}
+  ${PLATFORM_LIBRARIES}
+  ${BOOST_LIBRARIES}
+  SalomeIDLMED
+  MEDOPGUI_dialogs
+  MEDOPFactoryEngine
+  ${GUI_qtx}
+  ${GUI_suit}
+  ${GUI_SalomeObject}
+  ${KERNEL_SalomeLifeCycleCORBA}
+  ${KERNEL_SalomeKernelHelpers}
+  ${GUI_SalomeApp}
+  ${GUI_SalomeGuiHelpers}
+  ${GUI_SalomeTreeData}
+  ${KERNEL_OpUtil}
+  ${GUI_CAM}
+  ${GUI_LightApp}
+  ${GUI_PyConsole}
 )
 
-#-D__WITH_MEDMEMGUI__ libMEDGUI.la
+ADD_LIBRARY(MEDOPGUI SHARED ${MEDOPGUI_SOURCES} ${MEDOPGUI_HEADERS_MOC})
 IF(WITH_MEDMEMGUI)
-  SET(COMMON_DEFINITIONS "${COMMON_DEFINITIONS} -D__WITH_MEDMEMGUI__")
-  SET(COMMON_FLAGS ${COMMON_FLAGS} MEDGUI)
+  SET_TARGET_PROPERTIES(MEDOPGUI PROPERTIES COMPILE_FLAGS "-D__WITH_MEDMEMGUI__")
 ENDIF(WITH_MEDMEMGUI)
-
-ADD_LIBRARY(MEDOPGUI SHARED ${MEDOPGUI_SOURCES} ${MEDOPGUI_HEADERS_MOC})
-SET_TARGET_PROPERTIES(MEDOPGUI PROPERTIES COMPILE_FLAGS ${COMMON_DEFINITIONS})
 TARGET_LINK_LIBRARIES(MEDOPGUI ${COMMON_FLAGS})
 
-INSTALL(TARGETS MEDOPGUI DESTINATION ${MED_salomelib_LIBS})
+INSTALL(TARGETS MEDOPGUI DESTINATION ${SALOME_INSTALL_LIBS})
 QT4_INSTALL_TS_RESOURCES("${MEDOPGUITS_SOURCES}" "${MED_salomeres_DATA}")
 
 FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
-INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${MED_salomeinclude_HEADERS})
-
+INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})