mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-22 23:01:24 +08:00
3fadafface
* [many ports] Updates 2019.05.24 * Update SHA512 and resolve conflict for ebml and matroska * [avro-c]Fix build error caused by jansson upgrades. * [xxhash]Update to the next version to fix build error.(xxhash issue:#179) * Fix failures and undo asio * [libyaml, grpc, miniz, paho-mqtt, sqlitecpp] Update patches * Update REF * Undo nvtt flann itk libtins aws-sdk-cpp openvdb vlpp xmsh changes * [flann, fastcdr] Fix old patches and build error. * [flann, fastcdr] Fix build error. * Fix ensmallen uvatlas cppcms libplist failures and undo aws-c-common libopusenc arb taglib changes * [dcmtk, draco, flatbuffers, forge, ftgl, mosquitto,nmslib, ogre] Update old patches and fix build error. * fix libusbmuxd failures and undo xxhash paho-mqtt mongo-c-driver flann libffi * fix libimobiledevice and undo qhull harfbuzz lcm libbson draco flatbuffers * undo libmupdf forge kd-soap qca * [mosquitto] Fix installation of import libs * [arb][asio][aws-c-common][collada-dom][concurrentqueue][cryptopp][ebml] Revert trivial/undesired changes * [fastcdr] Minimize patch * [many ports] Revert trivial changes * [libyaml] Switch to non-dist tag * [sqlite-modern-cpp] Track master due to infrequent release * [nano-signal-slot] Revert downgrade * [openvpn3] Bump control version to account for portfile change * [sqlite-modern-cpp] Fixup wrong hash * [mosquitto] Commit missing patch
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
|
|
index a7a3796..2e21403 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 Utils/FindPkgMacros.cmake)
|
|
diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake
|
|
index 783755e..79f7514 100644
|
|
--- a/CMake/InstallResources.cmake
|
|
+++ b/CMake/InstallResources.cmake
|
|
@@ -208,10 +208,12 @@ endif ()
|
|
# Create the CMake package files
|
|
include(CMakePackageConfigHelpers)
|
|
|
|
-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()
|
|
configure_package_config_file(${OGRE_TEMPLATES_DIR}/OGREConfig.cmake.in ${PROJECT_BINARY_DIR}/cmake/OGREConfig.cmake
|
|
INSTALL_DESTINATION ${OGRE_CMAKE_DIR}
|