Delete key regression corrections: in previous implementation sketch entities did...

[modules/shaper.git] / src / XGUI / CMakeLists.txt

diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt
index 1cc72f76c5c777dfa905e0049c522fd7836893fb..b928158f31d8e576a125a978ca881ce7b07bd8a0 100644 (file)
--- 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
@@ -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
@@ -71,7 +73,6 @@ SET(PROJECT_LIBRARIES
     Config
        ModelAPI
        ModuleBase
-       AppElements
        ${QT_LIBRARIES}
        ${CAS_VIEWER}
        ${CAS_KERNEL}
@@ -83,6 +84,11 @@ SET(PROJECT_LIBRARIES
        ${qtx}
 )
 
+IF(NOT ${HAVE_SALOME})
+    SET(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} AppElements)
+ENDIF(NOT ${HAVE_SALOME})
+
+
 IF(WIN32) 
     SET(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} opengl32)
 ELSE()
@@ -105,17 +111,22 @@ 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 
@@ -135,3 +146,4 @@ TARGET_LINK_LIBRARIES(XGUI ${PROJECT_LIBRARIES})
 INSTALL(TARGETS XGUI DESTINATION bin)
 INSTALL(FILES ${QM_RESOURCES} DESTINATION bin)
 INSTALL(FILES ${PREFERENCES_XML} DESTINATION resources)
+