Changeset 8120 for code/branches/kicklib/cmake/tools

Timestamp:

Mar 26, 2011, 5:01:44 PM (14 years ago)

Author:

rgrieder

Message:

Cleanup in CEGUI framework finding.

File:

• code/branches/kicklib/cmake/tools/FindCEGUI.cmake (modified) (4 diffs)

code/branches/kicklib/cmake/tools/FindCEGUI.cmake

@@ -34 +34 @@
 FIND_PATH(CEGUI_INCLUDE_DIR CEGUI.h
   PATHS $ENV{CEGUIDIR}
-  PATH_SUFFIXES include include/CEGUI Headers
+  PATH_SUFFIXES include include/CEGUI
 )
 
@@ -60 +60 @@
     $ENV{CEGUILUADIR}
     ${CEGUI_INCLUDE_DIR}/ScriptingModules/LuaScriptModule
-  PATH_SUFFIXES include include/CEGUI Headers
+  PATH_SUFFIXES include include/CEGUI
 )
 # Find CEGUILua libraries
@@ -83 +83 @@
     ${CEGUILUA_INCLUDE_DIR}/support/tolua++
     # For Mac OS X, tolua++ is a separate framework in the dependency package
-    $ENV{CEGUITOLUADIR}
-  PATH_SUFFIXES Headers
+    ${DEP_FRAMEWORK_DIR}
   NO_DEFAULT_PATH # Don't attempt to find tolua++ installed on the system
 )
@@ -108 +107 @@
       $ENV{CEGUIOGRERENDERERDIR}
       ${CEGUI_INCLUDE_DIR}/RendererModules/Ogre
-    PATH_SUFFIXES include include/CEGUI Headers
+    PATH_SUFFIXES include include/CEGUI
   )
   # Find CEGUI OGRE Renderer libraries