diff options
| author | LazyHamster <ariman@inbox.ru> | 2017-11-08 17:50:49 +0300 |
|---|---|---|
| committer | LazyHamster <ariman@inbox.ru> | 2017-11-08 17:50:49 +0300 |
| commit | 3e36c7bc7f3929c0a5ddbc4de91ed660461a4532 (patch) | |
| tree | 42adb273b64535b43939f35184b1967fcf3d9bc6 /ports/ogre/001-cmake-install-dir.patch | |
| parent | f4b09f5782eeeb336d5f5a558aa0006e2cc40327 (diff) | |
| download | vcpkg-3e36c7bc7f3929c0a5ddbc4de91ed660461a4532.tar.gz vcpkg-3e36c7bc7f3929c0a5ddbc4de91ed660461a4532.zip | |
[ogre] Reincarnation of cmake install dir patch. Updated version to 1.10.9.
Diffstat (limited to 'ports/ogre/001-cmake-install-dir.patch')
| -rw-r--r-- | ports/ogre/001-cmake-install-dir.patch | 46 |
1 files changed, 46 insertions, 0 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) |