<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/aadb5d6703ee8f66cd5a1e1cf5753e35dd16a0e0">https://github.com/macports/macports-ports/commit/aadb5d6703ee8f66cd5a1e1cf5753e35dd16a0e0</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new aadb5d6703e ogre: update to 13.1.0
</span>aadb5d6703e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit aadb5d6703ee8f66cd5a1e1cf5753e35dd16a0e0
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Thu Oct 14 00:41:07 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> ogre: update to 13.1.0
</span>---
graphics/ogre/Portfile | 15 +--
graphics/ogre/files/CMakeLists.txt-docs.patch | 29 -----
graphics/ogre/files/CMakeLists.txt-objc.patch | 31 ------
graphics/ogre/files/CMakeLists.txt-resources.patch | 123 ---------------------
4 files changed, 5 insertions(+), 193 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ogre/Portfile b/graphics/ogre/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1ca3d9e14ac..9a483b6d8bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/ogre/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/ogre/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup boost 1.0
</span> PortGroup cmake 1.1
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup OGRECave ogre 13.0.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup OGRECave ogre 13.1.0 v
</span> github.tarball_from archive
revision 0
license MIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,10 +27,10 @@ homepage https://www.ogre3d.org/
</span> platforms darwin
supported_archs x86_64
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 52c0dd24b8ec427d35a97c2b73746298653ce8db \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 272345936aa286f848bb8aa1691521b34044ba53 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8d31a79d37f74e5af25e56a0a70928079e771f7cea50ef041e04bf235c3f701a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 91796574
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5d377c5199ed866b8e12a0d0e9ac372c3f5c5ba9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 a700a5b93fea7135f278dcaf24ba0c237176949e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 35f23042e366752bdb960adf280313dc845ff63968a784aeb73818100cdadf9e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 91787792
</span>
use_xcode yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,11 +52,6 @@ depends_lib-append port:assimp \
</span> port:swig \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles CMakeLists.txt-docs.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CMakeLists.txt-resources.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CMakeLists.txt-objc.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
reinplace "s|@rpath|\${prefix}/lib|" ${worksrcpath}/CMake/Utils/OgreConfigTargets.cmake
reinplace "s|/Release\"|\"|" ${worksrcpath}/CMake/Utils/OgreConfigTargets.cmake
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ogre/files/CMakeLists.txt-docs.patch b/graphics/ogre/files/CMakeLists.txt-docs.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f98999d6a0e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/ogre/files/CMakeLists.txt-docs.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-commit dd0fc59db59d277c18117680d2592093046daff8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Author: Kirill A. Korinsky <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue Sep 21 13:15:58 2021 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Allow to configure docs path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- This is trivial changes allows to control docs path.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/Docs/CMakeLists.txt b/Docs/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4e9b7a608..07127893f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/Docs/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/Docs/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,10 +13,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ###############################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set docs target directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if (WIN32 OR APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OGRE_DOCS_PATH "Docs")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--elseif (UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OGRE_DOCS_PATH "share/doc/OGRE")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if (NOT OGRE_DOCS_PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (WIN32 OR APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OGRE_DOCS_PATH "Docs")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elseif (UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OGRE_DOCS_PATH "share/doc/OGRE")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Build and install API documentation if doxygen is available
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ogre/files/CMakeLists.txt-objc.patch b/graphics/ogre/files/CMakeLists.txt-objc.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ab10970e2b3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/ogre/files/CMakeLists.txt-objc.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-commit a0905c8ed6861fbf47a5f25bc0eb9414b401a582
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Author: Kirill A. Korinsky <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue Sep 21 01:52:36 2021 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Enable OBJC and OBJCXX for apple build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Without this small changes build on macOS fails with error like:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ```
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error: Objective-C was disabled in PCH file but is currently enabled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ```
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- It enables languages `OBJC` and `OBJCXX` when `cmake >= 3.16.0` because
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CMake-3.16.0 was the first one which is supported `OBJC` and `OBJCXX`:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- https://discourse.cmake.org/t/cmake-3-16-0-available-for-download/262
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 599647c5a..75ee3f8ba 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,6 +46,11 @@ if (APPLE AND NOT ANDROID)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ enable_language(OBJC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ enable_language(OBJCXX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(POLICY CMP0068)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake_policy(SET CMP0068 NEW) # CMake 3.9+: `RPATH` settings on macOS do not affect `install_name`.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ogre/files/CMakeLists.txt-resources.patch b/graphics/ogre/files/CMakeLists.txt-resources.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index de5982925e2..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/ogre/files/CMakeLists.txt-resources.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,123 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-commit ed654c527297b5730de1503f55998454505eec10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Author: Kirill A. Korinsky <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue Sep 21 19:41:09 2021 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Allow to control resources path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- This commit introduced two CMake options `OGRE_MEDIA_PATH` and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- `OGRE_PLUGINS_PATH` to control such paths.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Also, it keeps `OGRE_CFG_INSTALL_PATH`, `OGRE_CMAKE_DIR` and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- `OGRE_PLUGIN_DIR_CMAKE` untouched when it exist.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9daa3dfb3..8211367f0 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/CMake/InstallResources.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/CMake/InstallResources.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,33 +11,63 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Generate and install the config files needed for the samples
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ##################################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if (WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OGRE_MEDIA_PATH "Media")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if (NOT OGRE_MEDIA_PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OGRE_MEDIA_PATH "Media")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OGRE_MEDIA_DIR_REL "${CMAKE_INSTALL_PREFIX}/${OGRE_MEDIA_PATH}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elseif (APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OGRE_MEDIA_PATH "Media")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(APPLE_IOS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OGRE_MEDIA_DIR_REL "${OGRE_MEDIA_PATH}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OGRE_MEDIA_DIR_REL "../${OGRE_MEDIA_PATH}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elseif (UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OGRE_MEDIA_PATH "share/OGRE/Media")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OGRE_MEDIA_DIR_REL "./Media")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(OGRE_MEDIA_DIR_REL "${CMAKE_INSTALL_PREFIX}/${OGRE_MEDIA_PATH}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if (NOT OGRE_PLUGINS_PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OGRE_PLUGINS_PATH "bin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OGRE_PLUGIN_DIR_REL "${CMAKE_INSTALL_PREFIX}/bin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elseif (APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OGRE_PLUGINS_PATH "lib/${CMAKE_BUILD_TYPE}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OGRE_PLUGIN_DIR_REL "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_BUILD_TYPE}/")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elseif (UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OGRE_PLUGINS_PATH "${OGRE_LIB_DIRECTORY}/OGRE")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OGRE_PLUGIN_DIR_REL "${CMAKE_INSTALL_PREFIX}/${OGRE_LIB_DIRECTORY}/OGRE")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OGRE_PLUGIN_DIR_REL "${CMAKE_INSTALL_PREFIX}/${OGRE_PLUGINS_PATH}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if (NOT OGRE_CFG_INSTALL_PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (WIN32 OR APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OGRE_CFG_INSTALL_PATH "bin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elseif (UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OGRE_CFG_INSTALL_PATH "share/OGRE")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if (WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(OGRE_TEST_MEDIA_DIR_REL "../Tests/${OGRE_MEDIA_PATH}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OGRE_PLUGIN_DIR_REL "${CMAKE_INSTALL_PREFIX}/bin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(OGRE_SAMPLES_DIR_REL ".")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OGRE_CFG_INSTALL_PATH "bin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif (APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OGRE_MEDIA_PATH "Media")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(APPLE_IOS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OGRE_MEDIA_DIR_REL "${OGRE_MEDIA_PATH}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(OGRE_TEST_MEDIA_DIR_REL "../../Tests/${OGRE_MEDIA_PATH}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OGRE_MEDIA_DIR_REL "../${OGRE_MEDIA_PATH}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(OGRE_TEST_MEDIA_DIR_REL "${CMAKE_INSTALL_PREFIX}/Tests/Media")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # these are resolved relative to the app bundle
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OGRE_PLUGIN_DIR_REL "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_BUILD_TYPE}/")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(OGRE_SAMPLES_DIR_REL "Contents/Plugins/")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(OGRE_CFG_INSTALL_PATH "bin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif (UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OGRE_MEDIA_PATH "share/OGRE/Media")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OGRE_MEDIA_DIR_REL "./Media")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(OGRE_TEST_MEDIA_DIR_REL "${CMAKE_INSTALL_PREFIX}/Tests/Media")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OGRE_PLUGIN_DIR_REL "${CMAKE_INSTALL_PREFIX}/${OGRE_LIB_DIRECTORY}/OGRE")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(OGRE_SAMPLES_DIR_REL "${CMAKE_INSTALL_PREFIX}/${OGRE_LIB_DIRECTORY}/OGRE/Samples")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OGRE_CFG_INSTALL_PATH "share/OGRE")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # generate OgreConfigPaths.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -210,16 +240,22 @@ endif ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Create the CMake package files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(CMakePackageConfigHelpers)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(WIN32 OR APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OGRE_CMAKE_DIR "CMake")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if (NOT OGRE_CMAKE_DIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(WIN32 OR APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OGRE_CMAKE_DIR "CMake")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OGRE_PLUGIN_DIR_CMAKE "bin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OGRE_PLUGIN_DIR_CMAKE "${OGRE_LIB_DIRECTORY}/OGRE")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if (NOT OGRE_PLUGIN_DIR_CMAKE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OGRE_PLUGIN_DIR_CMAKE "bin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OGRE_PLUGIN_DIR_CMAKE "${OGRE_LIB_DIRECTORY}/OGRE")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure_package_config_file(${OGRE_TEMPLATES_DIR}/OGREConfig.cmake.in ${PROJECT_BINARY_DIR}/cmake/OGREConfig.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_DESTINATION ${OGRE_CMAKE_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PATH_VARS OGRE_MEDIA_PATH OGRE_PLUGIN_DIR_CMAKE OGRE_CFG_INSTALL_PATH CMAKE_INSTALL_PREFIX)
</span></pre><pre style='margin:0'>
</pre>