From 7354d1eccb4dcd6a432ca88588c1d0ada911d72a Mon Sep 17 00:00:00 2001
From: Sylvain THESNIERES <garvek@gmail.com>
Date: Fri, 8 Jun 2012 19:54:12 +0200
Subject: [PATCH] CMake fixes: - Fix environment variable in Bullet - Remove
 spurious message in MyGUI

---
 cmake/FindBullet.cmake | 2 ++
 cmake/FindMyGUI.cmake  | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cmake/FindBullet.cmake b/cmake/FindBullet.cmake
index 552a0651a..8d5ea2f1e 100644
--- a/cmake/FindBullet.cmake
+++ b/cmake/FindBullet.cmake
@@ -19,6 +19,8 @@
 # BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
+set(BULLET_ROOT $ENV{BULLET_ROOT})
+
 macro(_FIND_BULLET_LIBRARY _var)
   find_library(${_var}
      NAMES
diff --git a/cmake/FindMyGUI.cmake b/cmake/FindMyGUI.cmake
index c79ee5998..7278fe200 100644
--- a/cmake/FindMyGUI.cmake
+++ b/cmake/FindMyGUI.cmake
@@ -22,7 +22,7 @@ IF (WIN32) #Windows
 SET(MYGUISDK $ENV{MYGUI_HOME})
     IF (MYGUISDK)
 findpkg_begin ( "MYGUI" )
-        MESSAGE(STATUS "Using MyGUI in OGRE SDK")
+        MESSAGE(STATUS "Using MyGUI in MyGUI SDK")
 STRING(REGEX REPLACE "[\\]" "/" MYGUISDK "${MYGUISDK}" )
 
 find_path ( MYGUI_INCLUDE_DIRS
@@ -35,7 +35,7 @@ MyGUI_OgrePlatform.h
 "${MYGUISDK}/Platforms/Ogre/OgrePlatform/include"
 NO_DEFAULT_PATH )
 
-SET ( MYGUI_LIB_DIR ${MYGUISDK}/*/lib )
+SET ( MYGUI_LIB_DIR ${MYGUISDK}/lib ${MYGUISDK}/*/lib )
 
 find_library ( MYGUI_LIBRARIES_REL NAMES
 MyGUIEngine.lib
@@ -69,7 +69,7 @@ make_library_set ( MYGUI_PLATFORM_LIBRARIES )
 MESSAGE ("${MYGUI_LIBRARIES}")
 MESSAGE ("${MYGUI_PLATFORM_LIBRARIES}")
 
-findpkg_finish ( "MYGUI" )
+#findpkg_finish ( "MYGUI" )
 
     ENDIF (MYGUISDK)
     IF (OGRESOURCE)