summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Gauthier POGAM--LE MONTAGNER <gauthier.pogam-lemontagner@epitech.eu> 2016-04-25 14:49:42 +0200
committerAvatar Kylie McClain <somasis@exherbo.org> 2016-05-06 13:43:48 +0200
commit6c755ed58772e39467f8937fa15225993f7ffe44 (patch)
treeda4ab9e762f502e212fa502f707d7570d66440b9
parent96e210fd24ef01c8fb232875694f98870d4d04bd (diff)
downloadgames-6c755ed58772e39467f8937fa15225993f7ffe44.tar.gz
games-6c755ed58772e39467f8937fa15225993f7ffe44.tar.xz
dev-libs/ogre: Fix compile without samples
Change-Id: If3a632e993541002e927ea3ed402cead840a89ad Reviewed-on: https://galileo.mailstation.de/gerrit/5892 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Kylie McClain <somasis@exherbo.org>
-rw-r--r--packages/dev-libs/ogre/files/ogre-1.9.0-Fix-build-without-samples.patch19
-rw-r--r--packages/dev-libs/ogre/ogre-1.9.0.exheres-04
2 files changed, 23 insertions, 0 deletions
diff --git a/packages/dev-libs/ogre/files/ogre-1.9.0-Fix-build-without-samples.patch b/packages/dev-libs/ogre/files/ogre-1.9.0-Fix-build-without-samples.patch
new file mode 100644
index 0000000..e3691e9
--- /dev/null
+++ b/packages/dev-libs/ogre/files/ogre-1.9.0-Fix-build-without-samples.patch
@@ -0,0 +1,19 @@
+Source: written by maerwald
+Upstream: Pull request: https://bitbucket.org/sinbad/ogre/pull-requests/661/fix-compile-without-samples/diff
+Reason: Fix build when OIS is not on the system.
+
+--- ogre-1.9.0/Samples/CMakeLists.txt
++++ ogre-1.9.0/Samples/CMakeLists.txt
+@@ -4,11 +4,10 @@
+ message(STATUS "Could not find dependency: OIS")
+ message(STATUS "Skipping samples build")
+ set(OGRE_BUILD_SAMPLES 0)
+- else()
+- include_directories(${OIS_INCLUDE_DIR})
+ endif()
+
+ if (OGRE_BUILD_SAMPLES)
++ include_directories(${OIS_INCLUDE_DIRS})
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Common/include)
+
+ # Make sure all plugins are built
diff --git a/packages/dev-libs/ogre/ogre-1.9.0.exheres-0 b/packages/dev-libs/ogre/ogre-1.9.0.exheres-0
index e9be393..b09ce41 100644
--- a/packages/dev-libs/ogre/ogre-1.9.0.exheres-0
+++ b/packages/dev-libs/ogre/ogre-1.9.0.exheres-0
@@ -53,6 +53,10 @@ RESTRICT="test"
CMAKE_SOURCE=${WORKBASE}/sinbad-${PN}-dd30349ea667
+DEFAULT_SRC_PREPARE_PATCHES=(
+ "${FILES}"/${PNV}-Fix-build-without-samples.patch
+)
+
# - TBB, POCO can also be used as thread implementations
# look at those at some time
# - doxygen is executed automatically if found, should probably