X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FQxGraph%2FCMakeLists.txt;h=04d8fae41cc9d7e79241eb3bf6d0119a734a6f0d;hb=95d09d48a30f08befd46da420c02e9732891c743;hp=8ae5b0a0e9187f66828cba3d98c873c98256afb4;hpb=2826a25d32dec49fc3c143f13b3e9059506e7409;p=modules%2Fgui.git

diff --git a/src/QxGraph/CMakeLists.txt b/src/QxGraph/CMakeLists.txt
index 8ae5b0a0e..04d8fae41 100755
--- a/src/QxGraph/CMakeLists.txt
+++ b/src/QxGraph/CMakeLists.txt
@@ -17,14 +17,14 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/UseQT4EXT.cmake)
+INCLUDE(UseQt4Ext)
 
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
   ${QT_INCLUDES}
   ${Boost_INCLUDE_DIRS}
   ${PYTHON_INCLUDE_DIRS}
-  ${KERNEL_ROOT_DIR}/include/salome
+  ${KERNEL_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/../Qtx
   ${CMAKE_CURRENT_SOURCE_DIR}/../SUIT
 )
@@ -59,7 +59,7 @@ ADD_DEFINITIONS("${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS} ${PYT
 
 ADD_LIBRARY(QxGraph ${QxGraph_SOURCES} ${GUI_HEADERS_MOC})
 TARGET_LINK_LIBRARIES(QxGraph ${COMMON_LIBS})
-INSTALL(TARGETS QxGraph DESTINATION ${GUI_salomelib_LIBS})
+INSTALL(TARGETS QxGraph EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 SET(COMMON_HEADERS_H 
   QxGraph_ActiveItem.h
@@ -73,8 +73,8 @@ SET(COMMON_HEADERS_H
   QxGraph.h
 )
 
-INSTALL(FILES ${COMMON_HEADERS_H} DESTINATION ${GUI_salomeinclude_HEADERS})
-QT4_INSTALL_TS_RESOURCES("${GUITS_SOURCES}" "${GUI_salomeres_DATA}")
+INSTALL(FILES ${COMMON_HEADERS_H} DESTINATION ${SALOME_INSTALL_HEADERS})
+QT4_INSTALL_TS_RESOURCES("${GUITS_SOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")
 
 FILE(GLOB GUIPNG_DATA "${CMAKE_CURRENT_SOURCE_DIR}/resources/*.png")
-INSTALL(FILES ${GUIPNG_DATA} DESTINATION ${GUI_salomeres_DATA})
+INSTALL(FILES ${GUIPNG_DATA} DESTINATION ${SALOME_GUI_INSTALL_RES_DATA})