diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2018-03-09 12:58:01 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-09 12:58:01 -0800 |
| commit | 6dbc38d3a0c4bb93431f8be74d0a024c3e1d8b4e (patch) | |
| tree | 6a1f86597f5ecb3ab42a1f68d00a115000e00936 | |
| parent | e94352fabf794a9c7c055a192035cd43342e4c9b (diff) | |
| parent | f20b53c20873725a2872456ba02f774c3cffb662 (diff) | |
| download | vcpkg-6dbc38d3a0c4bb93431f8be74d0a024c3e1d8b4e.tar.gz vcpkg-6dbc38d3a0c4bb93431f8be74d0a024c3e1d8b4e.zip | |
Merge pull request #2932 from cenit/dev/cenit/ogre_upd
[ogre] update to v1.10.11
| -rw-r--r-- | ports/ogre/001-cmake-install-dir.patch | 48 | ||||
| -rw-r--r-- | ports/ogre/portfile.cmake | 16 |
2 files changed, 27 insertions, 37 deletions
diff --git a/ports/ogre/001-cmake-install-dir.patch b/ports/ogre/001-cmake-install-dir.patch index cf73bc977..27c6d2f70 100644 --- a/ports/ogre/001-cmake-install-dir.patch +++ b/ports/ogre/001-cmake-install-dir.patch @@ -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) diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index f42b4c220..8281960c6 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -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() |