X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGLViewer%2FCMakeLists.txt;h=be67c0169b3c4a45f0439b350736959c4a58ca96;hb=797f7c8b3ebf8d8a1eabc9082f8bd79f6f7ea413;hp=9a455f44af13f7e0b344d0273715d6b246f8713a;hpb=8c5294030a4c11ca0a18be48fc0165466861adad;p=modules%2Fgui.git

diff --git a/src/GLViewer/CMakeLists.txt b/src/GLViewer/CMakeLists.txt
index 9a455f44a..be67c0169 100755
--- a/src/GLViewer/CMakeLists.txt
+++ b/src/GLViewer/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,27 +17,97 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/UseQT4EXT.cmake)
+INCLUDE(UseQtExt)
+
+# --- options ---
 
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
-  ${PTHREAD_INCLUDE_DIRS}
-  ${QT_INCLUDE_DIRS}
-  ${CMAKE_CURRENT_SOURCE_DIR}/../Qtx
-  ${CMAKE_CURRENT_SOURCE_DIR}/../SUIT
+  ${OpenCASCADE_INCLUDE_DIR}
+  ${QT_INCLUDES}
+  ${PROJECT_SOURCE_DIR}/src/Qtx
+  ${PROJECT_SOURCE_DIR}/src/SUIT
+)
+
+# additional preprocessor / compiler flags
+ADD_DEFINITIONS(${OpenCASCADE_DEFINITIONS} ${QT_DEFINITIONS})
+
+# libraries to link to
+SET(_link_LIBRARIES ${QT_LIBRARIES} ${OpenCASCADE_FoundationClasses_LIBRARIES} ${OPENGL_LIBRARIES} qtx suit)
+IF(NOT (WIN32 OR APPLE))
+  LIST(APPEND _link_LIBRARIES Xmu)
+ENDIF()
+
+# --- headers ---
+
+# header files / to be processed by moc
+SET(_moc_HEADERS
+  GLViewer_Selector.h
+  GLViewer_Selector2d.h
+  GLViewer_ToolTip.h
+  GLViewer_ViewFrame.h
+  GLViewer_ViewManager.h
+  GLViewer_ViewPort.h
+  GLViewer_ViewPort2d.h
+  GLViewer_Viewer.h
+  GLViewer_Viewer2d.h
+  GLViewer_Widget.h
 )
 
-SET(COMMON_LIBS
-  suit 
-  ${QT_MT_LIBS} 
-  ${CAS_KERNEL} 
-  ${OGL_LIBS}
+# header files / no moc processing
+SET(_other_HEADERS
+  GLViewer.h
+  GLViewer_AspectLine.h
+  GLViewer_BaseDrawers.h
+  GLViewer_BaseObjects.h
+  GLViewer_Compass.h
+  GLViewer_Context.h
+  GLViewer_CoordSystem.h
+  GLViewer_Defs.h
+  GLViewer_Drawer.h
+  GLViewer_Geom.h
+  GLViewer_Grid.h
+  GLViewer_Group.h
+  GLViewer_MimeData.h
+  GLViewer_Object.h
+  GLViewer_Text.h
+  GLViewer_Tools.h
 )
 
-SET(GUI_HEADERS GLViewer_Selector.h GLViewer_Selector2d.h GLViewer_ToolTip.h GLViewer_ViewFrame.h GLViewer_ViewManager.h GLViewer_ViewPort.h GLViewer_ViewPort2d.h GLViewer_Viewer.h GLViewer_Viewer2d.h GLViewer_Widget.h)
-QT4_WRAP_CPP(GUI_HEADERS_MOC ${GUI_HEADERS})
+# header files / to install
+SET(GLViewer_HEADERS ${_moc_HEADERS} ${_other_HEADERS})
+
+# --- resources ---
+
+# resource files / to be processed by lrelease
+SET(_ts_RESOURCES
+  resources/GLViewer_images.ts
+  resources/GLViewer_msg_en.ts
+  resources/GLViewer_msg_fr.ts
+  resources/GLViewer_msg_ja.ts
+)
 
-SET(GLViewer_SOURCES
+# resource files / static
+SET(_other_RESOURCES
+  resources/gl_cursor_rotate.png
+  resources/gl_cursor_sketch.png
+  resources/gl_cursor_zoom.png
+  resources/gl_view_dump.png
+  resources/gl_view_fitall.png
+  resources/gl_view_fitarea.png
+  resources/gl_view_fitselect.png
+  resources/gl_view_glpan.png
+  resources/gl_view_pan.png
+  resources/gl_view_reset.png
+  resources/gl_view_zoom.png
+)
+
+# --- sources ---
+
+# sources / moc wrappings
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
+
+# sources / static
+SET(_other_SOURCES
   GLViewer_AspectLine.cxx
   GLViewer_BaseDrawers.cxx
   GLViewer_BaseObjects.cxx
@@ -53,8 +123,8 @@ SET(GLViewer_SOURCES
   GLViewer_Selector.cxx
   GLViewer_Selector2d.cxx
   GLViewer_Text.cxx
-  GLViewer_Tools.cxx
   GLViewer_ToolTip.cxx
+  GLViewer_Tools.cxx
   GLViewer_ViewFrame.cxx
   GLViewer_ViewManager.cxx
   GLViewer_ViewPort.cxx
@@ -64,20 +134,16 @@ SET(GLViewer_SOURCES
   GLViewer_Widget.cxx
 )
 
-SET(GUITS_SOURCES
-  resources/GLViewer_images.ts
-  resources/GLViewer_msg_en.ts
-  resources/GLViewer_msg_fr.ts
-)
+# sources / to compile
+SET(GLViewer_SOURCES ${_other_SOURCES} ${_moc_SOURCES})
+
+# --- rules ---
 
-ADD_LIBRARY(GLViewer SHARED ${GLViewer_SOURCES} ${GUI_HEADERS_MOC})
-SET_TARGET_PROPERTIES(GLViewer PROPERTIES COMPILE_FLAGS "${CAS_DEFINITIONS} ${QT_DEFINITIONS} ${PLATFORM_DEFINITIONS}")
-TARGET_LINK_LIBRARIES(GLViewer ${COMMON_LIBS})
-INSTALL(TARGETS GLViewer DESTINATION ${GUI_salomelib_LIBS})
+ADD_LIBRARY(GLViewer ${GLViewer_SOURCES})
+TARGET_LINK_LIBRARIES(GLViewer ${_link_LIBRARIES})
+INSTALL(TARGETS GLViewer EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
-FILE(GLOB COMMON_HEADERS_H "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
-INSTALL(FILES ${COMMON_HEADERS_H} DESTINATION ${GUI_salomeinclude_HEADERS})
-QT4_INSTALL_TS_RESOURCES("${GUITS_SOURCES}" "${GUI_salomeres_DATA}")
+INSTALL(FILES ${GLViewer_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
 
-FILE(GLOB GUIPNG_DATA "${CMAKE_CURRENT_SOURCE_DIR}/resources/*.png")
-INSTALL(FILES ${GUIPNG_DATA} DESTINATION ${GUI_salomeres_DATA})
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")
+INSTALL(FILES ${_other_RESOURCES} DESTINATION ${SALOME_GUI_INSTALL_RES_DATA})