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 652965fc1c905b20fc5e3029f8bc957dc8d2c66e..30949838013fffa5d394850023ac14e976158a47 100644 (file)
--- a/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@ -3,7 +3,9 @@ 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 +24,7 @@ SET(PROJECT_HEADERS
        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
@@ -47,6 +50,7 @@ SET(PROJECT_SOURCES
        XGUI_PartDataModel.cpp
        XGUI_ObjectsBrowser.cpp
     XGUI_SelectionMgr.cpp
+    XGUI_SwitchWidget.cpp
 )
 
 SET(PROJECT_RESOURCES 
@@ -58,11 +62,9 @@ SET(PROJECT_RESOURCES
 #)
 
 SET(PROJECT_LIBRARIES
-       opengl32
     Event
     Config
        ${QT_LIBRARIES}
-       ${QT_QTMAIN_LIBRARY}
        ${CAS_VIEWER}
        ${CAS_KERNEL}
        PyConsole
@@ -72,6 +74,12 @@ SET(PROJECT_LIBRARIES
        ModuleBase
 )
 
+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})
 
@@ -79,7 +87,7 @@ QT4_ADD_RESOURCES(PROJECT_COMPILED_RESOURCES ${PROJECT_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
@@ -92,7 +100,7 @@ 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}