The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 19:17:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2932 from cenit/dev/cenit/ogre_upd

Browse Source 
[ogre] update to v1.10.11
This commit is contained in:
Alexander Karatarakis 2018-03-09 12:58:01 -08:00 committed by GitHub
commit 6dbc38d3a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
ports/ogre/001-cmake-install-dir.patch
View File

@ -1,7 +1,5 @@
diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
index 3382de139..404c56e5e 100644
--- a/CMake/CMakeLists.txt
+++ b/CMake/CMakeLists.txt
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -13,10 +13,12 @@
# directory, but can also be used for custom projects.
#############################################################
@ -11,36 +9,30 @@ index 3382de139..404c56e5e 100644
-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()
+ 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 ()
--- a/cmake/InstallResources.cmake
+++ b/cmake/InstallResources.cmake
@@ -241,10 +241,12 @@ 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(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)
+ set(OGRE_CMAKE_DIR CMake)
+ elseif (UNIX)
+ set(OGRE_CMAKE_DIR lib/OGRE/cmake)
+ elseif (APPLE)
+ endif ()
+endif()
+ if(WIN32 OR APPLE)
+ set(OGRE_CMAKE_DIR "CMake")
+ else()
+ set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake")
+ 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)

16
ports/ogre/portfile.cmake
View File

@ -1,14 +1,12 @@
include(vcpkg_common_functions)
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/v${OGRE_VERSION}.zip"
FILENAME "ogre-${OGRE_VERSION}.zip"
SHA512 2e68b30da6dc2e1df6575970623a14057675b069536ed0ac87faeefc8e295965ff7427c99385f29ab803b02bd5294f6886293aabdd17ec8c92f80baf53587457
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO OGRECave/ogre
REF v1.10.11
SHA512 2dfedd6f0a0de1a8c687c001439138b233200ca11e5c9940debf43d8a0380ca6472e0b5f4d599f0e22ca2049d0a5d34066ef41b6bc4912130694fa5d851fc900
HEAD_REF master
)
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
@ -126,6 +124,6 @@ string(REPLACE "\"OgreMainStatic\"" "\"\${PACKAGE_PREFIX_DIR}/lib/manual-link/Og
file(WRITE "${CURRENT_PACKAGES_DIR}/share/ogre/OGREConfig.cmake" "${_contents}")
# Handle copyright
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ogre RENAME copyright)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ogre RENAME copyright)
vcpkg_copy_pdbs()