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 e740fea8ddc96246d45fcbcf96821c24fd81a3dc..30949838013fffa5d394850023ac14e976158a47 100644 (file)
--- a/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@ -1,11 +1,11 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
-
 INCLUDE(FindCAS)
 
 SET(CMAKE_AUTOMOC ON)
 
 SET(PROJECT_HEADERS
+       XGUI.h
        XGUI_Command.h
+       XGUI_Displayer.h
        XGUI_MainMenu.h
        XGUI_MainWindow.h
        XGUI_MenuGroupPanel.h
@@ -22,6 +22,9 @@ SET(PROJECT_HEADERS
        XGUI_DocumentDataModel.h
        XGUI_PartDataModel.h
        XGUI_ObjectsBrowser.h
+    XGUI_DataTreeModel.h
+    XGUI_SelectionMgr.h
+    XGUI_SwitchWidget.h
 )
 
 SET(PROJECT_AUTOMOC 
@@ -30,7 +33,7 @@ SET(PROJECT_AUTOMOC
 
 SET(PROJECT_SOURCES
        XGUI_Command.cpp
-       XGUI_Main.cpp
+       XGUI_Displayer.cpp
        XGUI_MainMenu.cpp
        XGUI_MainWindow.cpp
        XGUI_MenuGroupPanel.cpp
@@ -46,6 +49,8 @@ SET(PROJECT_SOURCES
        XGUI_DocumentDataModel.cpp
        XGUI_PartDataModel.cpp
        XGUI_ObjectsBrowser.cpp
+    XGUI_SelectionMgr.cpp
+    XGUI_SwitchWidget.cpp
 )
 
 SET(PROJECT_RESOURCES 
@@ -57,13 +62,11 @@ SET(PROJECT_RESOURCES
 #)
 
 SET(PROJECT_LIBRARIES
-       opengl32
     Event
     Config
-       ${Qt5Widgets_LIBRARIES}
+       ${QT_LIBRARIES}
        ${CAS_VIEWER}
        ${CAS_KERNEL}
-    ${CAS_OCAF}
        PyConsole
        PyInterp
        PyEvent
@@ -71,14 +74,20 @@ SET(PROJECT_LIBRARIES
        ModuleBase
 )
 
-QT5_ADD_RESOURCES(PROJECT_COMPILED_RESOURCES ${PROJECT_RESOURCES})
+IF(WIN32) 
+    SET(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} opengl32)
+ELSE()
+    SET(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} GL)
+ENDIF()
+
+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} )
+ADD_DEFINITIONS( -DXGUI_EXPORTS ${CAS_DEFINITIONS} )
 
 INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/src/Event
                                         ${PROJECT_SOURCE_DIR}/src/Config
@@ -91,11 +100,10 @@ INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/src/Event
 
 LINK_DIRECTORIES($ENV{PYTHON_LIB_DIR})
 
-ADD_EXECUTABLE(XGUI WIN32 
+ADD_LIBRARY(XGUI SHARED 
        ${PROJECT_SOURCES} 
        ${PROJECT_HEADERS} 
        ${PROJECT_COMPILED_RESOURCES} 
-       ${TEXT_RESOURCES} 
 )
 
 ADD_DEPENDENCIES(XGUI ModelAPI)