Changeset 8094

Timestamp:

Mar 19, 2011, 2:58:11 PM (13 years ago)

Author:

youngk

Message:

Testing commit for CMake find scripts (Mac)

Location:

code/branches/kicklib/cmake

Files:

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

code/branches/kicklib/cmake/PackageConfigOSX.cmake

@@ -46 +46 @@
 SET(ENV{CEGUIDIR}              ${DEP_FRAMEWORK_DIR})
 SET(ENV{LUA_DIR}               ${DEP_INCLUDE_DIR}/lua)
+SET(ENV{LUA5.1_DIR}            ${DEP_INCLUDE_DIR}/lua)
 SET(ENV{OGGDIR}                ${DEP_INCLUDE_DIR})
 SET(ENV{VORBISDIR}             ${DEP_INCLUDE_DIR})

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

@@ -44 +44 @@
   NAMES CEGUIBase CEGUI
   PATHS $ENV{CEGUIDIR}
-  PATH_SUFFIXES lib bin
+  PATH_SUFFIXES lib bin CEGUIBase.framework CEGUI.framework
 )
 FIND_LIBRARY(CEGUI_LIBRARY_DEBUG
@@ -57 +57 @@
 FIND_PATH(CEGUILUA_INCLUDE_DIR CEGUILua.h
   PATHS $ENV{CEGUIDIR} ${CEGUI_INCLUDE_DIR}/ScriptingModules/LuaScriptModule
-  PATH_SUFFIXES include include/CEGUI CEGUI.framework/Headers
+  PATH_SUFFIXES include include/CEGUI CEGUILuaScriptModule.framework/Headers
 )
 # Find CEGUILua libraries
@@ -63 +63 @@
   NAMES CEGUILua CEGUILuaScriptModule
   PATHS $ENV{CEGUIDIR}
-  PATH_SUFFIXES lib bin
+  PATH_SUFFIXES lib bin CEGUILuaScriptModule.framework
 )
 FIND_LIBRARY(CEGUILUA_LIBRARY_DEBUG
@@ -79 +79 @@
     # For newer CEGUI versions >= 0.7
     ${CEGUILUA_INCLUDE_DIR}/support/tolua++
+    # For Apples
+    $ENV{CEGUIDIR}
+  PATH_SUFFIXES ceguitolua++.framework/Headers
   NO_DEFAULT_PATH # MUST be in CEGUILUA_INCLUDE_DIR somewhere
 )
 # Find CEGUI Tolua++ libraries
 FIND_LIBRARY(CEGUI_TOLUA_LIBRARY_OPTIMIZED
-  NAMES CEGUItoluapp tolua++
+  NAMES CEGUItoluapp tolua++ ceguitolua++
   PATHS $ENV{CEGUIDIR}
-  PATH_SUFFIXES lib bin
+  PATH_SUFFIXES lib bin ceguitolua++.framework
 )
 FIND_LIBRARY(CEGUI_TOLUA_LIBRARY_DEBUG