Commit 8d9cc1c9 authored by Anton Gladky's avatar Anton Gladky

Update patches.

parent 1bec4219
...@@ -15,11 +15,11 @@ stable Yade release. ...@@ -15,11 +15,11 @@ stable Yade release.
create mode 100644 cMake/FindQGLVIEWER-qt5.cmake create mode 100644 cMake/FindQGLVIEWER-qt5.cmake
delete mode 100644 cMake/FindQGLVIEWER.cmake delete mode 100644 cMake/FindQGLVIEWER.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt Index: trunk-1.20.0/CMakeLists.txt
index 952a3be..44ca9cc 100644 ===================================================================
--- a/CMakeLists.txt --- trunk-1.20.0.orig/CMakeLists.txt
+++ b/CMakeLists.txt +++ trunk-1.20.0/CMakeLists.txt
@@ -223,9 +223,9 @@ IF(ENABLE_GUI) @@ -219,9 +219,9 @@ IF(ENABLE_GUI)
FIND_PACKAGE(OpenGL) FIND_PACKAGE(OpenGL)
FIND_PACKAGE(GLUT) FIND_PACKAGE(GLUT)
FIND_PACKAGE(glib2) FIND_PACKAGE(glib2)
...@@ -30,7 +30,7 @@ index 952a3be..44ca9cc 100644 ...@@ -30,7 +30,7 @@ index 952a3be..44ca9cc 100644
FIND_PACKAGE(Qt5 CONFIG REQUIRED Widgets Xml OpenGL) FIND_PACKAGE(Qt5 CONFIG REQUIRED Widgets Xml OpenGL)
SET(CMAKE_AUTOMOC ON) SET(CMAKE_AUTOMOC ON)
FIND_PACKAGE(Qt5Widgets) FIND_PACKAGE(Qt5Widgets)
@@ -242,6 +242,7 @@ IF(ENABLE_GUI) @@ -238,6 +238,7 @@ IF(ENABLE_GUI)
SET(ENABLE_GUI OFF) SET(ENABLE_GUI OFF)
ENDIF(Qt5Widgets_FOUND AND OPENGL_FOUND AND GLUT_FOUND AND GLIB2_FOUND AND QGLVIEWER_FOUND) ENDIF(Qt5Widgets_FOUND AND OPENGL_FOUND AND GLUT_FOUND AND GLIB2_FOUND AND QGLVIEWER_FOUND)
ELSE(USE_QT5) # Use Qt4 ELSE(USE_QT5) # Use Qt4
...@@ -38,11 +38,10 @@ index 952a3be..44ca9cc 100644 ...@@ -38,11 +38,10 @@ index 952a3be..44ca9cc 100644
FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtOpenGL) FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtOpenGL)
IF(QT4_FOUND AND OPENGL_FOUND AND GLUT_FOUND AND GLIB2_FOUND AND QGLVIEWER_FOUND) IF(QT4_FOUND AND OPENGL_FOUND AND GLUT_FOUND AND GLIB2_FOUND AND QGLVIEWER_FOUND)
SET(GUI_LIBS ${GLUT_LIBRARY} ${OPENGL_LIBRARY} ${QGLVIEWER_LIBRARIES}) SET(GUI_LIBS ${GLUT_LIBRARY} ${OPENGL_LIBRARY} ${QGLVIEWER_LIBRARIES})
diff --git a/cMake/FindQGLVIEWER-qt4.cmake b/cMake/FindQGLVIEWER-qt4.cmake Index: trunk-1.20.0/cMake/FindQGLVIEWER-qt4.cmake
new file mode 100644 ===================================================================
index 0000000..c196ff2
--- /dev/null --- /dev/null
+++ b/cMake/FindQGLVIEWER-qt4.cmake +++ trunk-1.20.0/cMake/FindQGLVIEWER-qt4.cmake
@@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@
+# - Try to find QGLViewer +# - Try to find QGLViewer
+# Once done this will define +# Once done this will define
...@@ -68,11 +67,10 @@ index 0000000..c196ff2 ...@@ -68,11 +67,10 @@ index 0000000..c196ff2
+ +
+include(FindPackageHandleStandardArgs) +include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(QGLVIEWER-qt4 DEFAULT_MSG QGLVIEWER_INCLUDE_DIR QGLVIEWER_LIBRARIES) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(QGLVIEWER-qt4 DEFAULT_MSG QGLVIEWER_INCLUDE_DIR QGLVIEWER_LIBRARIES)
diff --git a/cMake/FindQGLVIEWER-qt5.cmake b/cMake/FindQGLVIEWER-qt5.cmake Index: trunk-1.20.0/cMake/FindQGLVIEWER-qt5.cmake
new file mode 100644 ===================================================================
index 0000000..bbd15f9
--- /dev/null --- /dev/null
+++ b/cMake/FindQGLVIEWER-qt5.cmake +++ trunk-1.20.0/cMake/FindQGLVIEWER-qt5.cmake
@@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@
+# - Try to find QGLViewer +# - Try to find QGLViewer
+# Once done this will define +# Once done this will define
...@@ -98,10 +96,9 @@ index 0000000..bbd15f9 ...@@ -98,10 +96,9 @@ index 0000000..bbd15f9
+ +
+include(FindPackageHandleStandardArgs) +include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(QGLVIEWER-qt5 DEFAULT_MSG QGLVIEWER_INCLUDE_DIR QGLVIEWER_LIBRARIES) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(QGLVIEWER-qt5 DEFAULT_MSG QGLVIEWER_INCLUDE_DIR QGLVIEWER_LIBRARIES)
diff --git a/cMake/FindQGLVIEWER.cmake b/cMake/FindQGLVIEWER.cmake Index: trunk-1.20.0/cMake/FindQGLVIEWER.cmake
deleted file mode 100644 ===================================================================
index d7aeef6..0000000 --- trunk-1.20.0.orig/cMake/FindQGLVIEWER.cmake
--- a/cMake/FindQGLVIEWER.cmake
+++ /dev/null +++ /dev/null
@@ -1,25 +0,0 @@ @@ -1,25 +0,0 @@
-# - Try to find QGLViewer -# - Try to find QGLViewer
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment