diff -r d462de960e8e CMakeLists.txt
--- a/CMakeLists.txt	Sat Mar 09 17:02:08 2013 +0100
+++ b/CMakeLists.txt	Sun Mar 17 12:04:18 2013 +0100
@@ -63,10 +63,44 @@
 find_package(DirectXSDK)
 find_package(D3DX11Effects)
 find_package(Irrlicht)
+find_package(DirectFB)
+find_package(OpenGLES)
+
+SET(BACKUP_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
+SET(CMAKE_MODULE_PATH ${OGRE_HOME}/CMake)
 find_package(Ogre)
 find_package(OIS)
-find_package(DirectFB)
-find_package(OpenGLES)
+if (WIN32 OR APPLE)
+	set(Boost_USE_STATIC_LIBS TRUE)
+else ()
+	set(Boost_USE_STATIC_LIBS ${OGRE_STATIC})
+endif ()
+set(Boost_ADDITIONAL_VERSIONS "1.54" "1.54.0" "1.53" "1.53.0" "1.52" "1.52.0" "1.51" "1.51.0" "1.50" "1.50.0" "1.49" "1.49.0" "1.48" "1.48.0" "1.47" "1.47.0" "1.46" "1.46.0" "1.45" "1.45.0" "1.44" "1.44.0" "1.42" "1.42.0" "1.41.0" "1.41" "1.40.0" "1.40")
+# Components that need linking (NB does not include header-only components like bind)
+if(OGRE_FOUND)
+	set(CEGUI_BOOST_COMPONENTS python thread date_time)
+else()
+	set(CEGUI_BOOST_COMPONENTS python)
+endif()
+find_package(Boost COMPONENTS ${CEGUI_BOOST_COMPONENTS} QUIET)
+if (NOT Boost_FOUND)
+	# Try again with the other type of libs
+	if(Boost_USE_STATIC_LIBS)
+		set(Boost_USE_STATIC_LIBS OFF)
+	else()
+		set(Boost_USE_STATIC_LIBS ON)
+	endif()
+	find_package(Boost COMPONENTS ${CEGUI_BOOST_COMPONENTS} QUIET)
+endif()
+if(Boost_FOUND AND Boost_VERSION GREATER 104900 AND OGRE_FOUND)
+	set(CEGUI_BOOST_COMPONENTS python thread date_time system chrono)
+    find_package(Boost COMPONENTS ${CEGUI_BOOST_COMPONENTS} QUIET)
+endif()
+SET(CMAKE_MODULE_PATH ${BACKUP_CMAKE_MODULE_PATH})
+if(Boost_FOUND AND OGRE_FOUND)
+	set(OGRE_LIBRARIES ${OGRE_LIBRARIES} ${Boost_LIBRARIES})
+	set(OGRE_INCLUDE_DIR ${OGRE_INCLUDE_DIR} ${Boost_INCLUDE_DIRS})
+endif()
 
 find_package(EXPAT)
 find_package(XercesC)
@@ -84,7 +118,6 @@
 find_package(TOLUAPP)
 find_package(PythonInterp)
 find_package(PythonLibs)
-find_package(Boost 1.36.0 COMPONENTS python)
 
 find_package(Doxygen)
 find_package(GTK2 COMPONENTS gtk)
diff -r d462de960e8e cmake/FindOgre.cmake
--- a/cmake/FindOgre.cmake	Sat Mar 09 17:02:08 2013 +0100
+++ b/cmake/FindOgre.cmake	Sun Mar 17 12:04:18 2013 +0100
@@ -9,18 +9,3 @@
 mark_as_advanced(OGRE_H_PATH OGRE_LIB OGRE_LIB_DBG)
 
 find_package_handle_standard_args(OGRE DEFAULT_MSG OGRE_LIB OGRE_H_PATH)
-
-
-# set up output vars
-if (OGRE_FOUND)
-    set (OGRE_INCLUDE_DIR ${OGRE_H_PATH})
-    set (OGRE_LIBRARIES ${OGRE_LIB})
-    if (OGRE_LIB_DBG)
-        set (OGRE_LIBRARIES_DBG ${OGRE_LIB_DBG})
-    endif()
-else()
-    set (OGRE_INCLUDE_DIR)
-    set (OGRE_LIBRARIES)
-    set (OGRE_LIBRARIES_DBG)
-endif()
-
diff -r d462de960e8e samples_framework/include/CEGuiOgreBaseApplication.h
--- a/samples_framework/include/CEGuiOgreBaseApplication.h	Sat Mar 09 17:02:08 2013 +0100
+++ b/samples_framework/include/CEGuiOgreBaseApplication.h	Sun Mar 17 12:04:18 2013 +0100
@@ -123,7 +123,6 @@
     /*************************************************************************
         Data Fields
     *************************************************************************/
-    Ogre::Overlay* d_statsOverlay;
     OIS::InputManager* d_inputManager;
     OIS::Keyboard* d_keyboard;
     OIS::Mouse* d_mouse;
diff -r d462de960e8e samples_framework/src/CEGuiOgreBaseApplication.cpp
--- a/samples_framework/src/CEGuiOgreBaseApplication.cpp	Sat Mar 09 17:02:08 2013 +0100
+++ b/samples_framework/src/CEGuiOgreBaseApplication.cpp	Sun Mar 17 12:04:18 2013 +0100
@@ -142,8 +142,10 @@
     {
         d_ogreRoot->startRendering();
     }
-    CEGUI_CATCH(...)
-    {}
+    CEGUI_CATCH(Ogre::Exception ex)
+    {
+
+	}
 }
 
 //----------------------------------------------------------------------------//