diff options
| author | Saikrishna Arcot <saiarcot895@gmail.com> | 2016-06-07 00:07:46 (GMT) |
|---|---|---|
| committer | Saikrishna Arcot <saiarcot895@gmail.com> | 2016-06-07 00:07:46 (GMT) |
| commit | 8b3b780330bc194ace5eabb2d68ade22b37925e1 (patch) | |
| tree | 3447c9a400ce081702dbc0ba482a797e5954a9cc /src | |
| parent | 3b3af3e8b952eb3aafa14f70e6f69a5121f25f20 (diff) | |
| download | mxe-8b3b780330bc194ace5eabb2d68ade22b37925e1.zip mxe-8b3b780330bc194ace5eabb2d68ade22b37925e1.tar.gz mxe-8b3b780330bc194ace5eabb2d68ade22b37925e1.tar.bz2 | |
Modify patch to openscenegraph to require finding qt5 or qt4.
Diffstat (limited to 'src')
| -rw-r--r-- | src/openscenegraph-1-fixes.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/src/openscenegraph-1-fixes.patch b/src/openscenegraph-1-fixes.patch index a372c1d..057e636 100644 --- a/src/openscenegraph-1-fixes.patch +++ b/src/openscenegraph-1-fixes.patch @@ -182,3 +182,26 @@ index 1111111..2222222 100644 IF(GSTREAMER_FOUND AND GLIB_FOUND) ADD_SUBDIRECTORY(gstreamer) ENDIF() + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Saikrishna Arcot <saiarcot895@gmail.com> +Date: Mon, 6 Jun 2016 19:06:00 -0500 +Subject: [PATCH] Require the presence of either qt5 or qt4. + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1111111..2222222 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -712,9 +712,9 @@ IF(OSG_USE_QT AND NOT ANDROID) + + IF (DESIRED_QT_VERSION) + IF (DESIRED_QT_VERSION MATCHES 5) +- FIND_PACKAGE(Qt5Widgets) ++ FIND_PACKAGE(Qt5Widgets REQUIRED) + ELSEIF (DESIRED_QT_VERSION MATCHES 4) +- FIND_PACKAGE(Qt4) ++ FIND_PACKAGE(Qt4 REQUIRED) + ELSE() + FIND_PACKAGE(Qt3) + ENDIF() |