yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3714
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Thu 2015-08-27 11:46:29 +0200
message:
  Prepare Qt5 build.
modified:
  gui/CMakeLists.txt


--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription

=== modified file 'gui/CMakeLists.txt'
--- gui/CMakeLists.txt	2015-08-27 09:44:52 +0000
+++ gui/CMakeLists.txt	2015-08-27 09:46:29 +0000
@@ -4,32 +4,54 @@
     SET(CMAKE_AUTOMOC ON)
     SET(_GLViewer_SOURCE_FILES qt5/GLViewer.cpp;qt5/_GLViewer.cpp;qt5/OpenGLManager.cpp;qt5/GLViewerDisplay.cpp;qt5/GLViewerMouse.cpp)
     ADD_LIBRARY(_GLViewer SHARED ${_GLViewer_SOURCE_FILES})
-    
-    TARGET_LINK_LIBRARIES(_GLViewer Qt5::Widgets Qt5::Xml Qt5::OpenGL
-                                    ${GLUT_LIBRARY} ${OPENGL_LIBRARY}
-                                    ${QGLVIEWER_LIBRARIES}
-                                    ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
-    IF(GL2PS_FOUND AND ENABLE_GL2PS)
-      TARGET_LINK_LIBRARIES(_GLViewer ${GL2PS_LIBRARIES})
-    ENDIF(GL2PS_FOUND AND ENABLE_GL2PS)
-    INSTALL(TARGETS _GLViewer DESTINATION ${YADE_PY_PATH}/yade/qt)
-    
-    FILE(GLOB filesPYQT "${CMAKE_CURRENT_SOURCE_DIR}/qt5/*.py")
-    INSTALL(FILES ${filesPYQT} DESTINATION ${YADE_PY_PATH}/yade/qt)
-    
-    EXECUTE_PROCESS(
-          COMMAND "pyrcc5" "-o" "${CMAKE_BINARY_DIR}/img_rc.py" "img.qrc"
-          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/qt4
-          RESULT_VARIABLE rv
-          )
-    
-    EXECUTE_PROCESS(
-          COMMAND "pyuic5" "-o" "${CMAKE_BINARY_DIR}/ui_controller.py" "controller.ui"
-          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/qt5
-          RESULT_VARIABLE rv
-          )
-    INSTALL(FILES ${CMAKE_BINARY_DIR}/img_rc.py ${CMAKE_BINARY_DIR}/ui_controller.py  DESTINATION ${YADE_PY_PATH}/yade/qt)
-    
+    TARGET_LINK_LIBRARIES(_GLViewer Qt5::Widgets Qt5::Xml Qt5::OpenGL
+                                    ${GLUT_LIBRARY} ${OPENGL_LIBRARY}
+                                    ${QGLVIEWER_LIBRARIES}
+                                    ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
+    IF(GL2PS_FOUND AND ENABLE_GL2PS)
+      TARGET_LINK_LIBRARIES(_GLViewer ${GL2PS_LIBRARIES})
+    ENDIF(GL2PS_FOUND AND ENABLE_GL2PS)
+    INSTALL(TARGETS _GLViewer DESTINATION ${YADE_PY_PATH}/yade/qt)
+    
+    FILE(GLOB filesPYQT "${CMAKE_CURRENT_SOURCE_DIR}/qt5/*.py")
+    INSTALL(FILES ${filesPYQT} DESTINATION ${YADE_PY_PATH}/yade/qt)
+    
+    EXECUTE_PROCESS(
+          COMMAND "pyrcc5" "-o" "${CMAKE_BINARY_DIR}/img_rc.py" "img.qrc"
+          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/qt4
+          RESULT_VARIABLE rv
+          )
+    
+    EXECUTE_PROCESS(
+          COMMAND "pyuic5" "-o" "${CMAKE_BINARY_DIR}/ui_controller.py" "controller.ui"
+          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/qt5
+          RESULT_VARIABLE rv
+          )
+    INSTALL(FILES ${CMAKE_BINARY_DIR}/img_rc.py ${CMAKE_BINARY_DIR}/ui_controller.py  DESTINATION ${YADE_PY_PATH}/yade/qt)
+    TARGET_LINK_LIBRARIES(_GLViewer Qt5::Widgets Qt5::Xml Qt5::OpenGL
+                                    ${GLUT_LIBRARY} ${OPENGL_LIBRARY}
+                                    ${QGLVIEWER_LIBRARIES}
+                                    ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
+    IF(GL2PS_FOUND AND ENABLE_GL2PS)
+      TARGET_LINK_LIBRARIES(_GLViewer ${GL2PS_LIBRARIES})
+    ENDIF(GL2PS_FOUND AND ENABLE_GL2PS)
+    INSTALL(TARGETS _GLViewer DESTINATION ${YADE_PY_PATH}/yade/qt)
+    
+    FILE(GLOB filesPYQT "${CMAKE_CURRENT_SOURCE_DIR}/qt5/*.py")
+    INSTALL(FILES ${filesPYQT} DESTINATION ${YADE_PY_PATH}/yade/qt)
+    
+    EXECUTE_PROCESS(
+          COMMAND "pyrcc5" "-o" "${CMAKE_BINARY_DIR}/img_rc.py" "img.qrc"
+          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/qt4
+          RESULT_VARIABLE rv
+          )
+    
+    EXECUTE_PROCESS(
+          COMMAND "pyuic5" "-o" "${CMAKE_BINARY_DIR}/ui_controller.py" "controller.ui"
+          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/qt5
+          RESULT_VARIABLE rv
+          )
+    INSTALL(FILES ${CMAKE_BINARY_DIR}/img_rc.py ${CMAKE_BINARY_DIR}/ui_controller.py  DESTINATION ${YADE_PY_PATH}/yade/qt)
   ELSE(USE_QT5)
     INCLUDE(${QT_USE_FILE})