Corrections in Windows MSVC10 environment according to the Linux environment

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

diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt
index ea9af50b6bfd6138eea9e3575a077cf30d68ead6..8c338271acb04d6e41268d22c310fa90d75ceac0 100644 (file)
--- a/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@ -1,4 +1,3 @@
-INCLUDE(FindCAS)
 
 SET(CMAKE_AUTOMOC ON)
 
@@ -9,7 +8,6 @@ SET(PROJECT_HEADERS
        XGUI_MainMenu.h
        XGUI_MainWindow.h
        XGUI_MenuGroupPanel.h
-       XGUI_Module.h
        XGUI_Tools.h
        XGUI_Workbench.h
        XGUI_Workshop.h
@@ -18,7 +16,6 @@ SET(PROJECT_HEADERS
     XGUI_Viewer.h
        XGUI_RubberBand.h
        XGUI_Constants.h
-       XGUI_ViewBackground.h
        XGUI_DocumentDataModel.h
        XGUI_PartDataModel.h
        XGUI_ObjectsBrowser.h
@@ -30,9 +27,11 @@ SET(PROJECT_HEADERS
     XGUI_ErrorDialog.h
     XGUI_SalomeViewer.h
     XGUI_ViewerProxy.h
-    XGUI_ViewerPrs.h
     XGUI_PropertyPanel.h
     XGUI_ContextMenuMgr.h
+    XGUI_ModuleConnector.h
+       XGUI_Selection.h
+       XGUI_Preferences.h
 )
 
 SET(PROJECT_AUTOMOC 
@@ -52,7 +51,6 @@ SET(PROJECT_SOURCES
     XGUI_ViewPort.cpp
     XGUI_Viewer.cpp
        XGUI_RubberBand.cpp
-       XGUI_ViewBackground.cpp
        XGUI_DocumentDataModel.cpp
        XGUI_PartDataModel.cpp
        XGUI_ObjectsBrowser.cpp
@@ -61,15 +59,21 @@ SET(PROJECT_SOURCES
     XGUI_ActionsMgr.cpp
     XGUI_ErrorDialog.cpp
     XGUI_ViewerProxy.cpp
-    XGUI_ViewerPrs.cpp
     XGUI_PropertyPanel.cpp
     XGUI_ContextMenuMgr.cpp
+    XGUI_ModuleConnector.cpp
+       XGUI_Selection.cpp
+       XGUI_Preferences.cpp
 )
 
 SET(PROJECT_RESOURCES 
     XGUI_pictures.qrc
 )
 
+SET(PREFERENCES_XML
+       NewGeom.xml
+)
+
 SET(TEXT_RESOURCES
        XGUI_msg_fr.ts
 )
@@ -77,14 +81,16 @@ SET(TEXT_RESOURCES
 SET(PROJECT_LIBRARIES
     Events
     Config
+       ModelAPI
+       ModuleBase
        ${QT_LIBRARIES}
        ${CAS_VIEWER}
        ${CAS_KERNEL}
-       PyConsole
-       PyInterp
-       PyEvent
-       ModelAPI
-       ModuleBase
+       ${PYTHON_LIBRARIES}
+       ${PyConsole}
+       ${PyInterp}
+       ${suit}
+       ${qtx}
 )
 
 IF(WIN32) 
@@ -105,18 +111,18 @@ QT4_CREATE_TRANSLATION(QM_RESOURCES
 
 SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES} ${QM_RESOURCES})
 #SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES})
-SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES} ${PROJECT_RESOURCES})
+SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES} ${PROJECT_RESOURCES} ${PREFERENCES_XML})
 
 ADD_DEFINITIONS( -DXGUI_EXPORTS ${CAS_DEFINITIONS} )
 
 INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/src/Events
                                         ${PROJECT_SOURCE_DIR}/src/Config
-                                        ${PROJECT_SOURCE_DIR}/src/PyInterp
-                                        ${PROJECT_SOURCE_DIR}/src/PyConsole
                                         ${PROJECT_SOURCE_DIR}/src/ModelAPI
-                                        ${PROJECT_SOURCE_DIR}/src/Model
+                                        ${PROJECT_SOURCE_DIR}/src/GeomAPI
                                         ${PROJECT_SOURCE_DIR}/src/ModuleBase
-                                        ${CAS_INCLUDE_DIRS})
+                                        ${PROJECT_SOURCE_DIR}/src/PartSetPlugin
+                                        ${CAS_INCLUDE_DIRS}
+                                        ${SUIT_INCLUDE})
 
 LINK_DIRECTORIES($ENV{PYTHON_LIB_DIR})
 
@@ -126,6 +132,7 @@ ADD_LIBRARY(XGUI SHARED
        ${PROJECT_COMPILED_RESOURCES} 
        ${TEXT_RESOURCES}
        ${QM_RESOURCES}
+       ${PREFERENCES_XML}
 )
 
 ADD_DEPENDENCIES(XGUI ModelAPI)
@@ -135,3 +142,4 @@ TARGET_LINK_LIBRARIES(XGUI ${PROJECT_LIBRARIES})
 
 INSTALL(TARGETS XGUI DESTINATION bin)
 INSTALL(FILES ${QM_RESOURCES} DESTINATION bin)
+INSTALL(FILES ${PREFERENCES_XML} DESTINATION resources)