Updated FindCorrade.cmake from Corrade repository.

modules/FindCorrade.cmake

@@ -19,10 +19,10 @@
 # hidden visibility by default.
 #
 # Features of found Corrade library are exposed in these variables:
-#  CORRADE_GCC46_COMPATIBILITY  - Defined if compiled with compatibility
-#   mode for GCC 4.6
 #  CORRADE_GCC47_COMPATIBILITY  - Defined if compiled with compatibility
 #   mode for GCC 4.7
+#  CORRADE_GCC46_COMPATIBILITY  - Defined if compiled with compatibility
+#   mode for GCC 4.6
 #  CORRADE_BUILD_STATIC         - Defined if compiled as static libraries
 #  CORRADE_TARGET_NACL          - Defined if compiled for Google Chrome
 #   Native Client
@@ -116,11 +116,16 @@ find_library(CORRADE_TESTSUITE_LIBRARY CorradeTestSuite)
 # RC executable
 find_program(CORRADE_RC_EXECUTABLE corrade-rc)
 
-# Paths
+# Include dir
 find_path(CORRADE_INCLUDE_DIR
     NAMES PluginManager Utility
     PATH_SUFFIXES Corrade)
 
+# CMake module dir
+find_path(_CORRADE_MODULE_DIR
+    NAMES UseCorrade.cmake CorradeLibSuffix.cmake
+    PATH_SUFFIXES share/cmake/Corrade)
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Corrade DEFAULT_MSG
     CORRADE_UTILITY_LIBRARY
@@ -128,7 +133,8 @@ find_package_handle_standard_args(Corrade DEFAULT_MSG
     CORRADE_PLUGINMANAGER_LIBRARY
     CORRADE_TESTSUITE_LIBRARY
     CORRADE_INCLUDE_DIR
-    CORRADE_RC_EXECUTABLE)
+    CORRADE_RC_EXECUTABLE
+    _CORRADE_MODULE_DIR)
 
 if(NOT CORRADE_FOUND)
     return()
@@ -180,6 +186,9 @@ endif()
 mark_as_advanced(CORRADE_UTILITY_LIBRARY
     CORRADE_INTERCONNECT_LIBRARY
     CORRADE_PLUGINMANAGER_LIBRARY
-    CORRADE_TESTSUITE_LIBRARY)
+    CORRADE_TESTSUITE_LIBRARY
+    _CORRADE_MODULE_DIR)
 
+# Include file with macros from our module dir
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${_CORRADE_MODULE_DIR}")
 include(UseCorrade)