Salome HOME
projects
/
tools
/
medcoupling.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correction of Renaud.
[tools/medcoupling.git]
/
src
/
MEDOP
/
gui
/
CMakeLists.txt
diff --git
a/src/MEDOP/gui/CMakeLists.txt
b/src/MEDOP/gui/CMakeLists.txt
index 7ad04d92b315512efb0b5d9f816b76ea877c865f..a87be78651f74b02f23ba30837b263d5ad3bc8c7 100644
(file)
--- a/
src/MEDOP/gui/CMakeLists.txt
+++ b/
src/MEDOP/gui/CMakeLists.txt
@@
-17,6
+17,8
@@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
# 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)
INCLUDE(${QT_USE_FILE})
SET(QT_LIBS "${QT_LIBRARIES}")
INCLUDE(UseQt4Ext)
@@
-51,8
+53,8
@@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}/dialogs
${CMAKE_CURRENT_SOURCE_DIR}/../cmp
${CMAKE_CURRENT_SOURCE_DIR}/../../MEDGUI
${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
)
SET(MEDOPGUITS_SOURCES
@@
-60,43
+62,38
@@
SET(MEDOPGUITS_SOURCES
MED_msg_en.ts
MED_msg_fr.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
${CAS_KERNEL}
SET(COMMON_FLAGS
${CAS_KERNEL}
- ${QT_MT_LIBS}
+ ${QT_MT_LIB
RARIE
S}
${OMNIORB_LIBRARIES}
${OMNIORB_LIBRARIES}
- ${PLATFORM_LIBS}
- ${BOOST_LIBS}
+ ${PLATFORM_LIB
RARIE
S}
+ ${BOOST_LIB
RARIE
S}
SalomeIDLMED
MEDOPGUI_dialogs
MEDOPFactoryEngine
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}
)
)
-#-D__WITH_MEDMEMGUI__ libMEDGUI.la
+ADD_LIBRARY(MEDOPGUI SHARED ${MEDOPGUI_SOURCES} ${MEDOPGUI_HEADERS_MOC})
IF(WITH_MEDMEMGUI)
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)
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})
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")
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})