X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FCMakeLists.txt;h=b84f87ca7145ecc9f7a0c38cfc25cf61923a02bf;hb=1a59f21be05badd17bcac9ce82b2857b961f1d2e;hp=56f7bebd6fd2e5aab5007b7d590399e309ba701d;hpb=1b93f1881c5fec599aa79707f93c84dd9c287bc0;p=modules%2Fshaper.git

diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt
index 56f7bebd6..b84f87ca7 100644
--- a/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@ -28,7 +28,7 @@ SET(PROJECT_HEADERS
 	XGUI_WorkshopListener.h
 )
 
-SET(PROJECT_AUTOMOC 
+SET(PROJECT_AUTOMOC
     ${CMAKE_CURRENT_BINARY_DIR}/XGUI_automoc.cpp
 )
 
@@ -56,12 +56,12 @@ SET(PROJECT_SOURCES
 	XGUI_WorkshopListener.cpp
 )
 
-SET(PROJECT_RESOURCES 
+SET(PROJECT_RESOURCES
     XGUI_pictures.qrc
 )
 
 SET(PREFERENCES_XML
-	NewGeom.xml
+	SHAPER.xml
 )
 
 SET(TEXT_RESOURCES
@@ -89,7 +89,7 @@ IF(NOT ${HAVE_SALOME})
 ENDIF(NOT ${HAVE_SALOME})
 
 
-IF(WIN32) 
+IF(WIN32)
     SET(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} opengl32)
 ELSE()
     SET(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} GL)
@@ -98,7 +98,7 @@ ENDIF()
 QT4_ADD_RESOURCES(PROJECT_COMPILED_RESOURCES ${PROJECT_RESOURCES})
 #QT5_ADD_TRANSLATION(QM_RESOURCES ${TEXT_RESOURCES})
 
-QT4_CREATE_TRANSLATION(QM_RESOURCES 
+QT4_CREATE_TRANSLATION(QM_RESOURCES
 					   ${PROJECT_SOURCES}
 					   ${TEXT_RESOURCES}
 					   OPTIONS -extensions cpp -no-recursive
@@ -111,7 +111,7 @@ SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES} ${PROJECT_RESOURCES} ${PR
 
 ADD_DEFINITIONS( -DXGUI_EXPORTS ${CAS_DEFINITIONS} )
 
-SET(PROJECT_INCLUDES 
+SET(PROJECT_INCLUDES
     ${PROJECT_SOURCE_DIR}/src/Events
     ${PROJECT_SOURCE_DIR}/src/Config
     ${PROJECT_SOURCE_DIR}/src/ModelAPI
@@ -122,17 +122,17 @@ SET(PROJECT_INCLUDES
     ${SUIT_INCLUDE})
 
 IF(NOT ${HAVE_SALOME})
-    SET(PROJECT_INCLUDES ${PROJECT_INCLUDES} ${PROJECT_SOURCE_DIR}/src/AppElements)
+    SET(PROJECT_INCLUDES ${PROJECT_INCLUDES} ${APPELEMENTS_INCLUDE_DIR})
 ENDIF(NOT ${HAVE_SALOME})
 
 INCLUDE_DIRECTORIES(${PROJECT_INCLUDES})
-                         
+
 LINK_DIRECTORIES($ENV{PYTHON_LIB_DIR})
 
-ADD_LIBRARY(XGUI SHARED 
-	${PROJECT_SOURCES} 
-	${PROJECT_HEADERS} 
-	${PROJECT_COMPILED_RESOURCES} 
+ADD_LIBRARY(XGUI SHARED
+	${PROJECT_SOURCES}
+	${PROJECT_HEADERS}
+	${PROJECT_COMPILED_RESOURCES}
 	${TEXT_RESOURCES}
 	${QM_RESOURCES}
 	${PREFERENCES_XML}
@@ -143,6 +143,6 @@ ADD_DEPENDENCIES(XGUI ModelAPI)
 # The Qt5Widgets_LIBRARIES variable also includes QtGui and QtCore
 TARGET_LINK_LIBRARIES(XGUI ${PROJECT_LIBRARIES})
 
-INSTALL(TARGETS XGUI DESTINATION bin)
-INSTALL(FILES ${QM_RESOURCES} DESTINATION bin)
-INSTALL(FILES ${PREFERENCES_XML} DESTINATION resources)
+INSTALL(TARGETS XGUI DESTINATION ${SHAPER_INSTALL_BIN})
+INSTALL(FILES ${QM_RESOURCES} DESTINATION ${SHAPER_INSTALL_QM_RESOURCES})
+INSTALL(FILES ${PREFERENCES_XML} DESTINATION ${SHAPER_INSTALL_RESOURCES})