Merge remote branch 'ace/cmake' into defeat

cmake/FindOGRE.cmake

@@ -26,13 +26,15 @@ IF (WIN32) #Windows
         SET(OGRE_INCLUDE_DIR ${OGRESDK}/include)
         SET(OGRE_LIB_DIR ${OGRESDK}/lib)
         SET(OGRE_LIBRARIES debug OgreMain_d optimized OgreMain)
-    ENDIF (OGRESDK)
-    IF (OGRESOURCE)
+    ELSEIF (OGRESOURCE)
         MESSAGE(STATUS "Using OGRE built from source")
         SET(OGRE_INCLUDE_DIR $ENV{OGRE_SRC}/OgreMain/include)
         SET(OGRE_LIB_DIR $ENV{OGRE_SRC}/lib)
         SET(OGRE_LIBRARIES debug OgreMain_d optimized OgreMain)
-    ENDIF (OGRESOURCE)
+    ELSE (OGRESDK)
+        MESSAGE(STATUS "Using OGRE paths from CMake")
+        SET(OGRE_LIBRARIES debug OgreMain_d optimized OgreMain)
+    ENDIF (OGRESDK)
 ENDIF (WIN32)
 
 IF (UNIX AND NOT APPLE)
@@ -80,9 +82,12 @@ SET(OGRE_LIB_DIR ${OGRE_LIB_DIR} CACHE PATH "")
 
 if(OGRE_LIB_DIR)
     CMAKE_POLICY(SET CMP0009 NEW)
-    IF (NOT APPLE)
+    IF (WIN32)
+        FILE(GLOB_RECURSE OGRE_PLUGINS "${OGRE_LIB_DIR}/Plugin_*.lib")
+    ENDIF (WIN32)
+    IF (NOT APPLE AND NOT WIN32)
 	   	FILE(GLOB_RECURSE OGRE_PLUGINS "${OGRE_LIB_DIR}/Plugin_*.so")
-	ENDIF (NOT APPLE)
+	ENDIF (NOT APPLE AND NOT WIN32)
 	IF (APPLE)
    		FILE(GLOB_RECURSE OGRE_PLUGINS "${OGRE_LIB_DIR}/Plugin_*.dylib")
    	ENDIF (APPLE)