From e445dfe8f8cf3bc2b98f878768637cc4a662927d Mon Sep 17 00:00:00 2001
From: Joakim Haugen <joakim.haugen@sintef.no>
Date: Fri, 28 Jun 2024 11:35:07 +0200
Subject: [PATCH] Do minor changes to cmake files

This is a partial port of the commit
3568f43cd5b1e246aec3f1347fc353f388885f1a from the ogre (not ogre-next)
repository, omitting the zip header changes which doesn't apply.

  * MacroLogFeature: Clarify that even if a package is found it will not be used if a feature is disabled
  * Use list append on CMAKE_MODULE_PATH to allow prepending it with toolchain file, which is used with conan recipe.
---
 CMake/Utils/MacroLogFeature.cmake | 2 +-
 CMakeLists.txt                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMake/Utils/MacroLogFeature.cmake b/CMake/Utils/MacroLogFeature.cmake
index c2efe2edb6e..e21fbc103d6 100644
--- a/CMake/Utils/MacroLogFeature.cmake
+++ b/CMake/Utils/MacroLogFeature.cmake
@@ -110,7 +110,7 @@ MACRO(MACRO_DISPLAY_FEATURE_LOG)
       SET(_elist 1)
       FILE(READ ${_file} _enabled)
       FILE(REMOVE ${_file})
-      SET(_summary "${_summary}-----------------------------------------------------------------------------\n-- The following external packages were located on your system.\n-- This installation will have the extra features provided by these packages.\n${_enabled}")
+      SET(_summary "${_summary}-----------------------------------------------------------------------------\n-- The following external packages were located on your system.\n-- This installation will have the extra features provided by these packages, unless disabled.\n${_enabled}")
    ENDIF (EXISTS ${_file})
 
    SET(_dlist 0)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9828a8056d2..97586df41bc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,7 +61,7 @@ set(OGRE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(OGRE_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 
 # Include necessary submodules
-set(CMAKE_MODULE_PATH
+list(APPEND CMAKE_MODULE_PATH
   "${OGRE_SOURCE_DIR}/CMake"
   "${OGRE_SOURCE_DIR}/CMake/Utils"
   "${OGRE_SOURCE_DIR}/CMake/Packages"