[ogre] Reincarnation of cmake install dir patch. Updated version to 1.10.9.

3 files changed, 60 insertions, 9 deletions

diff --git a/ports/ogre/001-cmake-install-dir.patch b/ports/ogre/001-cmake-install-dir.patch
new file mode 100644
index 000000000..cf73bc977
--- /dev/null
+++ b/ports/ogre/001-cmake-install-dir.patch
@@ -0,0 +1,46 @@
+diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
+index 3382de139..404c56e5e 100644
+--- a/CMake/CMakeLists.txt
++++ b/CMake/CMakeLists.txt
+@@ -13,10 +13,12 @@
+ # directory, but can also be used for custom projects.
+ #############################################################
+ 
+-if(WIN32 OR APPLE)
+-	set(OGRE_CMAKE_DIR "CMake")
+-else()
+-	set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
++if (NOT DEFINED OGRE_CMAKE_DIR)
++	if(WIN32 OR APPLE)
++		set(OGRE_CMAKE_DIR "CMake")
++	else()
++		set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
++	endif()
+ endif()
+ 
+ set(INST_FILES
+diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake
+index 0181259e2..346188c73 100644
+--- a/CMake/InstallResources.cmake
++++ b/CMake/InstallResources.cmake
+@@ -245,12 +245,14 @@ endif ()
+ # Create the CMake package files
+ include(CMakePackageConfigHelpers)
+ 
+-if (WIN32)
+-   set(OGRE_CMAKE_DIR CMake)
+-elseif (UNIX)
+-   set(OGRE_CMAKE_DIR lib/OGRE/cmake)
+-elseif (APPLE)
+-endif ()
++if (NOT DEFINED OGRE_CMAKE_DIR)
++  if (WIN32)
++    set(OGRE_CMAKE_DIR CMake)
++  elseif (UNIX)
++    set(OGRE_CMAKE_DIR lib/OGRE/cmake)
++  elseif (APPLE)
++  endif ()
++endif()
+ configure_package_config_file(${OGRE_TEMPLATES_DIR}/OGREConfig.cmake.in ${OGRE_BINARY_DIR}/cmake/OGREConfig.cmake
+     INSTALL_DESTINATION ${OGRE_CMAKE_DIR}
+     PATH_VARS CMAKE_INSTALL_PREFIX)
diff --git a/ports/ogre/CONTROL b/ports/ogre/CONTROL
index 98d68abf0..1716ac116 100644
--- a/ports/ogre/CONTROL
+++ b/ports/ogre/CONTROL
@@ -1,5 +1,5 @@
 Source: ogre
-Version: 1.10.8
+Version: 1.10.9
 Build-Depends: freeimage, freetype, zlib, zziplib
 Description: 3D Object-Oriented Graphics Rendering Engine
 
diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake
index 9c380f79e..9ee84f82c 100644
--- a/ports/ogre/portfile.cmake
+++ b/ports/ogre/portfile.cmake
@@ -1,15 +1,21 @@
 include(vcpkg_common_functions)
 
-set(OGRE_VERSION 1.10.8)
+set(OGRE_VERSION 1.10.9)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ogre-${OGRE_VERSION})
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/OGRECave/ogre/archive/v1.10.8.zip"
-    FILENAME "ogre-1.10.8.zip"
-    SHA512 c7d962fe7fb8c46a4e15bb6e2bb68c67f0cc2a0d04a8f53e03fb9572c76df3679dcd117137c6624f2f56a8eda108723817dbaa616ecb7dc4cfd6a644a6bc4356
+    URLS "https://github.com/OGRECave/ogre/archive/v${OGRE_VERSION}.zip"
+    FILENAME "ogre-${OGRE_VERSION}.zip"
+    SHA512 2e68b30da6dc2e1df6575970623a14057675b069536ed0ac87faeefc8e295965ff7427c99385f29ab803b02bd5294f6886293aabdd17ec8c92f80baf53587457
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES
+        "${CMAKE_CURRENT_LIST_DIR}/001-cmake-install-dir.patch"
+)
+
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
     set(OGRE_STATIC ON)
 else()
@@ -66,18 +72,17 @@ vcpkg_configure_cmake(
         -DOGRE_BUILD_COMPONENT_JAVA=${WITH_JAVA}
         -DOGRE_BUILD_COMPONENT_PYTHON=${WITH_PYTHON}
         -DOGRE_BUILD_RENDERSYSTEM_D3D9=${WITH_D3D9}
+# vcpkg specific stuff
+        -DOGRE_CMAKE_DIR=share/ogre
 )
 
 vcpkg_install_cmake()
 
 # Remove unwanted files
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/CMake)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ogre RENAME copyright)
 
-# Move installed CMake scripts to share folder
-file(RENAME ${CURRENT_PACKAGES_DIR}/CMake ${CURRENT_PACKAGES_DIR}/share/ogre/CMake)
-
 vcpkg_copy_pdbs()