🚚 Moved OGRE to different subfolder

This commit is contained in:
2021-08-05 16:21:39 +02:00
parent 93c5b2d9c0
commit bfa980b20a
6 changed files with 86 additions and 74 deletions

View File

@ -0,0 +1,11 @@
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -16,6 +16,8 @@
cmake_minimum_required(VERSION 3.3.0)
+include(${CMAKE_BINARY_DIR}/conan_paths.cmake)
+
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

View File

@ -0,0 +1,11 @@
--- CMake/Dependencies.cmake
+++ CMake/Dependencies.cmake
@@ -13,7 +13,7 @@
# OGRE_DEPENDENCIES_DIR can be used to specify a single base
# folder where the required dependencies may be found.
-set(OGRE_DEPENDENCIES_DIR "" CACHE PATH "Path to prebuilt OGRE dependencies")
+set(OGRE_DEPENDENCIES_DIR ${CMAKE_PREFIX_PATH})
option(OGRE_BUILD_DEPENDENCIES "automatically build Ogre Dependencies (freetype, zzip)" TRUE)
include(FindPkgMacros)

View File

@ -0,0 +1,11 @@
--- Samples/CMakeLists.txt
+++ Samples/CMakeLists.txt
@@ -108,7 +108,7 @@
install(FILES ${SAMPLE_COMMON_HEADERS}
DESTINATION include/OGRE)
-if (MSVC)
+if (_NOT_USED)
find_package(Wix)
if (Wix_FOUND)
# Create WiX setup for demo build