Changeset 8120

Timestamp:

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

Author:

rgrieder

Message:

Cleanup in CEGUI framework finding.

Location:

code/branches/kicklib/cmake

Files:

• PackageConfigOSX.cmake (modified) (1 diff)
• tools/FindCEGUI.cmake (modified) (4 diffs)

code/branches/kicklib/cmake/PackageConfigOSX.cmake

@@ -33 +33 @@
 ENDIF()
 
-SET(DEP_INCLUDE_DIR ${DEPENDENCY_PACKAGE_DIR}/include)
-SET(DEP_LIBRARY_DIR ${DEPENDENCY_PACKAGE_DIR}/lib)
-SET(DEP_BINARY_DIR  ${DEPENDENCY_PACKAGE_DIR}/bin)
+SET(DEP_INCLUDE_DIR   ${DEPENDENCY_PACKAGE_DIR}/include)
+SET(DEP_LIBRARY_DIR   ${DEPENDENCY_PACKAGE_DIR}/lib)
+SET(DEP_BINARY_DIR    ${DEPENDENCY_PACKAGE_DIR}/bin)
 SET(DEP_FRAMEWORK_DIR ${DEPENDENCY_PACKAGE_DIR}/Library/Frameworks)
 
-# Sets the library path for the FIND_LIBRARY
-SET(CMAKE_LIBRARY_PATH ${DEP_LIBRARY_DIR})
+# Sets the library and framwork paths for the FIND_LIBRARY commands
+SET(CMAKE_LIBRARY_PATH   ${DEP_LIBRARY_DIR})
+SET(CMAKE_FRAMEWORK_PATH ${DEP_FRAMEWORK_DIR})
 
 # Include paths and other special treatments
-SET(ENV{ALUTDIR}               ${DEP_FRAMEWORK_DIR})
-SET(ENV{BOOST_ROOT}            ${DEPENDENCY_PACKAGE_DIR})
-SET(ENV{CEGUIDIR}              ${DEP_FRAMEWORK_DIR})
-SET(ENV{CEGUILUADIR}           ${DEP_FRAMEWORK_DIR}/CEGUILuaScriptModule.framework)
-SET(ENV{CEGUITOLUADIR}         ${DEP_FRAMEWORK_DIR}/ceguitolua++.framework)
-SET(ENV{LUA5.1_DIR}            $ENV{CEGUILUADIR}/Versions/A/Resources/lua.framework)
-SET(ENV{OGGDIR}                ${DEP_INCLUDE_DIR})
-SET(ENV{VORBISDIR}             ${DEP_INCLUDE_DIR})
-SET(ENV{OGRE_HOME}             ${DEP_FRAMEWORK_DIR})
-SET(ENV{OGRE_PLUGIN_DIR}       ${DEP_BINARY_DIR})
+SET(ENV{BOOST_ROOT}      ${DEPENDENCY_PACKAGE_DIR})
+SET(ENV{LUA5.1_DIR}      ${DEP_FRAMEWORK_DIR}/CEGUI.framework/Versions/A/Resources)
+SET(ENV{OGGDIR}          ${DEP_INCLUDE_DIR})
+SET(ENV{VORBISDIR}       ${DEP_INCLUDE_DIR})
+SET(ENV{OGRE_PLUGIN_DIR} ${DEP_BINARY_DIR})
 
 # For OS X 10.5 we have to ship modified headers to make it compile

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