yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3713
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Thu 2015-08-27 11:44:52 +0200
message:
  First steps in Qt5.
modified:
  CMakeLists.txt
  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 'CMakeLists.txt'
--- CMakeLists.txt	2015-06-26 20:19:22 +0000
+++ CMakeLists.txt	2015-08-27 09:44:52 +0000
@@ -223,6 +223,8 @@
     
   IF(USE_QT5)
     FIND_PACKAGE(Qt5 CONFIG REQUIRED Widgets Xml OpenGL)
+    SET(CMAKE_AUTOMOC ON)
+    FIND_PACKAGE(Qt5Widgets)
     IF(Qt5Widgets_FOUND AND OPENGL_FOUND AND GLUT_FOUND AND GLIB2_FOUND AND QGLVIEWER_FOUND)
       SET(GUI_LIBS ${GLUT_LIBRARY} ${QGLVIEWER_LIBRARIES})
       SET(GUI_SRC_LIB "lib/opengl/GLUtils.cpp")

=== modified file 'gui/CMakeLists.txt'
--- gui/CMakeLists.txt	2015-06-26 20:19:22 +0000
+++ gui/CMakeLists.txt	2015-08-27 09:44:52 +0000
@@ -29,6 +29,7 @@
           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})