X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FCMakeLists.txt;h=b84f87ca7145ecc9f7a0c38cfc25cf61923a02bf;hb=220bd2b37119be1c65abf88a88792445cb9d99f8;hp=1cc72f76c5c777dfa905e0049c522fd7836893fb;hpb=75d946b4df9ea0f43fd6802bcebf8c3971539fc9;p=modules%2Fshaper.git

diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt
index 1cc72f76c..b84f87ca7 100644
--- a/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@ -12,6 +12,7 @@ SET(PROJECT_HEADERS
 	XGUI_DataModel.h
 	XGUI_Displayer.h
 	XGUI_ErrorDialog.h
+	XGUI_ErrorMgr.h
 	XGUI_HistoryMenu.h
 	XGUI_ModuleConnector.h
 	XGUI_ObjectsBrowser.h
@@ -27,7 +28,7 @@ SET(PROJECT_HEADERS
 	XGUI_WorkshopListener.h
 )
 
-SET(PROJECT_AUTOMOC 
+SET(PROJECT_AUTOMOC
     ${CMAKE_CURRENT_BINARY_DIR}/XGUI_automoc.cpp
 )
 
@@ -39,6 +40,7 @@ SET(PROJECT_SOURCES
 	XGUI_DataModel.cpp
 	XGUI_Displayer.cpp
 	XGUI_ErrorDialog.cpp
+	XGUI_ErrorMgr.cpp
 	XGUI_HistoryMenu.cpp
 	XGUI_ModuleConnector.cpp
 	XGUI_ObjectsBrowser.cpp
@@ -54,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
@@ -71,7 +73,6 @@ SET(PROJECT_LIBRARIES
     Config
 	ModelAPI
 	ModuleBase
-	AppElements
 	${QT_LIBRARIES}
 	${CAS_VIEWER}
 	${CAS_KERNEL}
@@ -83,7 +84,12 @@ SET(PROJECT_LIBRARIES
 	${qtx}
 )
 
-IF(WIN32) 
+IF(NOT ${HAVE_SALOME})
+    SET(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} AppElements)
+ENDIF(NOT ${HAVE_SALOME})
+
+
+IF(WIN32)
     SET(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} opengl32)
 ELSE()
     SET(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} GL)
@@ -92,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
@@ -105,23 +111,28 @@ SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES} ${PROJECT_RESOURCES} ${PR
 
 ADD_DEFINITIONS( -DXGUI_EXPORTS ${CAS_DEFINITIONS} )
 
-INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/src/Events
-					 ${PROJECT_SOURCE_DIR}/src/Config
-					 ${PROJECT_SOURCE_DIR}/src/ModelAPI
-					 ${PROJECT_SOURCE_DIR}/src/GeomAPI
-					 ${PROJECT_SOURCE_DIR}/src/ModuleBase
-#					 ${PROJECT_SOURCE_DIR}/src/PartSetPlugin
-					 ${PROJECT_SOURCE_DIR}/src/GeomAlgoAPI
-					 ${PROJECT_SOURCE_DIR}/src/AppElements
-					 ${CAS_INCLUDE_DIRS}
-					 ${SUIT_INCLUDE})
+SET(PROJECT_INCLUDES
+    ${PROJECT_SOURCE_DIR}/src/Events
+    ${PROJECT_SOURCE_DIR}/src/Config
+    ${PROJECT_SOURCE_DIR}/src/ModelAPI
+    ${PROJECT_SOURCE_DIR}/src/GeomAPI
+    ${PROJECT_SOURCE_DIR}/src/ModuleBase
+    ${PROJECT_SOURCE_DIR}/src/GeomAlgoAPI
+    ${CAS_INCLUDE_DIRS}
+    ${SUIT_INCLUDE})
+
+IF(NOT ${HAVE_SALOME})
+    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}
@@ -132,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})