Merge branch 'master' of newgeom:newgeom

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

diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt
index 5093a6167a378676dfd828510101256efa1af640..bd4e643dd0093a3e97492bb0e5813713241a3b14 100644 (file)
--- a/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@ -1,5 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
-
 INCLUDE(FindCAS)
 
 SET(CMAKE_AUTOMOC ON)
@@ -18,6 +16,12 @@ SET(PROJECT_HEADERS
        XGUI_RubberBand.h
        XGUI_Constants.h
        XGUI_ViewBackground.h
+       XGUI_WidgetFactory.h
+       XGUI_DocumentDataModel.h
+       XGUI_PartDataModel.h
+       XGUI_ObjectsBrowser.h
+    XGUI_DataTreeModel.h
+    XGUI_SelectionMgr.h
 )
 
 SET(PROJECT_AUTOMOC 
@@ -38,32 +42,46 @@ SET(PROJECT_SOURCES
     XGUI_Viewer.cpp
        XGUI_RubberBand.cpp
        XGUI_ViewBackground.cpp
+       XGUI_WidgetFactory.cpp
+       XGUI_DocumentDataModel.cpp
+       XGUI_PartDataModel.cpp
+       XGUI_ObjectsBrowser.cpp
+    XGUI_SelectionMgr.cpp
 )
 
 SET(PROJECT_RESOURCES 
     XGUI_pictures.qrc
 )
 
-SET(TEXT_RESOURCES
-       XGUI_msg_en.ts
-)
+#SET(TEXT_RESOURCES
+#      XGUI_msg_en.ts
+#)
 
 SET(PROJECT_LIBRARIES
-       opengl32
     Event
     Config
-       ${Qt5Widgets_LIBRARIES}
+       ${QT_LIBRARIES}
+       ${QT_QTMAIN_LIBRARY}
        ${CAS_VIEWER}
        ${CAS_KERNEL}
        PyConsole
        PyInterp
        PyEvent
+       ModelAPI
+       ModuleBase
 )
 
-QT5_ADD_RESOURCES(PROJECT_COMPILED_RESOURCES ${PROJECT_RESOURCES})
-QT5_ADD_TRANSLATION(QM_RESOURCES ${TEXT_RESOURCES})
+IF(WIN32) 
+    SET(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} opengl32)
+ELSE()
+    SET(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} GL)
+ENDIF()
 
-SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES} ${QM_RESOURCES})
+QT4_ADD_RESOURCES(PROJECT_COMPILED_RESOURCES ${PROJECT_RESOURCES})
+#QT5_ADD_TRANSLATION(QM_RESOURCES ${TEXT_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})
 
 ADD_DEFINITIONS(${CAS_DEFINITIONS} )
@@ -72,6 +90,9 @@ INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/src/Event
                                         ${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/ModuleBase
                                         ${CAS_INCLUDE_DIRS})
 
 LINK_DIRECTORIES($ENV{PYTHON_LIB_DIR})
@@ -80,12 +101,12 @@ ADD_EXECUTABLE(XGUI WIN32
        ${PROJECT_SOURCES} 
        ${PROJECT_HEADERS} 
        ${PROJECT_COMPILED_RESOURCES} 
-       ${TEXT_RESOURCES} 
-       ${QM_RESOURCES}
 )
 
+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 ${QM_RESOURCES} DESTINATION bin)