]> SALOME platform Git repositories - modules/med.git/commitdiff
Salome HOME
Migration to OpenCASCADE CMake configuration V8_5_0a2
authorrnv <rnv@opencascade.com>
Wed, 15 Feb 2017 15:13:08 +0000 (18:13 +0300)
committerrnv <rnv@opencascade.com>
Mon, 5 Mar 2018 15:52:50 +0000 (18:52 +0300)
src/MEDGUI/CMakeLists.txt

index b44ef44e4220f550ecc9e9094026c622d50f2656..cbb8ddbc10a0b8282d1ddabd037d495e7127ae15 100644 (file)
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${MEDFILE_DEFINITIONS} ${XDR_DEFINITIONS} ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS} ${OMNIORB_DEFINITIONS})
+ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${MEDFILE_DEFINITIONS} ${XDR_DEFINITIONS} ${BOOST_DEFINITIONS} ${OMNIORB_DEFINITIONS})
 
 INCLUDE(UseQtExt)
 
@@ -38,7 +38,6 @@ QT_WRAP_UIC(MEDGUI_FORMS_HEADERS ${MEDGUI_FORMS})
 
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS}
@@ -56,6 +55,6 @@ 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})
+TARGET_LINK_LIBRARIES(MEDGUI medcalculator ${QT_MT_LIBS} ${BOOST_LIBRARIES} ${GUI_LDFLAGS} ${SalomeApp} ${CAM} ${LightApp} ${qtx} ${suit} ${SalomeObject} ${PLATFORM_LIBS} ${SalomeLifeCycleCORBA})
 INSTALL(TARGETS MEDGUI DESTINATION ${SALOME_INSTALL_LIBS})
 QT_INSTALL_TS_RESOURCES("${MEDGUITS_SOURCES}" "${SALOME_MED_INSTALL_RES_DATA}")