Regression fix: not toggled up button on closing of contour of lines

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

diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt
index c7a27c7161cfdc275dc1f0be70c5ca5f2282d253..56f7bebd6fd2e5aab5007b7d590399e309ba701d 100644 (file)
--- a/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@ -6,15 +6,17 @@ SET(CMAKE_AUTOMOC ON)
 SET(PROJECT_HEADERS
        XGUI.h
        XGUI_ActionsMgr.h
+       XGUI_ColorDialog.h
        XGUI_ContextMenuMgr.h
-       XGUI_DataTreeModel.h
+       XGUI_CustomPrs.h
+       XGUI_DataModel.h
        XGUI_Displayer.h
-       XGUI_DocumentDataModel.h
        XGUI_ErrorDialog.h
+       XGUI_ErrorMgr.h
+       XGUI_HistoryMenu.h
        XGUI_ModuleConnector.h
        XGUI_ObjectsBrowser.h
        XGUI_OperationMgr.h
-       XGUI_PartDataModel.h
        XGUI_PropertyPanel.h
        XGUI_QtEvents.h
        XGUI_SalomeConnector.h
@@ -23,7 +25,7 @@ SET(PROJECT_HEADERS
        XGUI_Tools.h
        XGUI_ViewerProxy.h
        XGUI_Workshop.h
-       XGUI_HistoryMenu.h
+       XGUI_WorkshopListener.h
 )
 
 SET(PROJECT_AUTOMOC 
@@ -32,22 +34,26 @@ SET(PROJECT_AUTOMOC
 
 SET(PROJECT_SOURCES
        XGUI_ActionsMgr.cpp
+       XGUI_ColorDialog.cpp
        XGUI_ContextMenuMgr.cpp
+       XGUI_CustomPrs.cpp
+       XGUI_DataModel.cpp
        XGUI_Displayer.cpp
-       XGUI_DocumentDataModel.cpp
        XGUI_ErrorDialog.cpp
+       XGUI_ErrorMgr.cpp
+       XGUI_HistoryMenu.cpp
        XGUI_ModuleConnector.cpp
        XGUI_ObjectsBrowser.cpp
        XGUI_OperationMgr.cpp
-       XGUI_PartDataModel.cpp
        XGUI_PropertyPanel.cpp
        XGUI_QtEvents.cpp
+       XGUI_SalomeConnector.cpp
        XGUI_Selection.cpp
        XGUI_SelectionMgr.cpp
        XGUI_Tools.cpp
        XGUI_ViewerProxy.cpp
        XGUI_Workshop.cpp
-       XGUI_HistoryMenu.cpp
+       XGUI_WorkshopListener.cpp
 )
 
 SET(PROJECT_RESOURCES 
@@ -67,7 +73,6 @@ SET(PROJECT_LIBRARIES
     Config
        ModelAPI
        ModuleBase
-       AppElements
        ${QT_LIBRARIES}
        ${CAS_VIEWER}
        ${CAS_KERNEL}
@@ -79,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()
@@ -101,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} ${PROJECT_SOURCE_DIR}/src/AppElements)
+ENDIF(NOT ${HAVE_SALOME})
+
+INCLUDE_DIRECTORIES(${PROJECT_INCLUDES})
+                         
 LINK_DIRECTORIES($ENV{PYTHON_LIB_DIR})
 
 ADD_LIBRARY(XGUI SHARED