Changeset 2647

Timestamp:

Feb 12, 2009, 2:53:08 PM (16 years ago)

Author:

rgrieder

Message:

Merged Chai's work on Apple. I wasn't able to do the trick with CheckOGREPlugins.cmake though because I don't really know how plugins work on OSX.

Location:

code/branches/buildsystem2/cmake

Files:

• FindCEGUI.cmake (modified) (1 diff)
• FindOGRE.cmake (modified) (1 diff)
• LibraryConfigTardis.cmake (modified) (1 diff)

code/branches/buildsystem2/cmake/FindCEGUI.cmake

@@ -35 +35 @@
 FIND_PATH(CEGUI_INCLUDE_DIR CEGUI.h
   PATHS $ENV{CEGUIDIR}
-  PATH_SUFFIXES include include/CEGUI
+  PATH_SUFFIXES include include/CEGUI CEGUI.framework/Headers
 )
 FIND_LIBRARY(CEGUI_LIBRARY_OPTIMIZED
-  NAMES CEGUIBase
+  NAMES CEGUIBase CEGUI
   PATHS $ENV{CEGUIDIR}
   PATH_SUFFIXES lib bin
 )
 FIND_LIBRARY(CEGUI_LIBRARY_DEBUG
-  NAMES CEGUIBased CEGUIBase_d
+  NAMES CEGUIBased CEGUIBase_d CEGUId CEGUI_d
   PATHS $ENV{CEGUIDIR}
   PATH_SUFFIXES lib bin

code/branches/buildsystem2/cmake/FindOGRE.cmake

@@ -23 +23 @@
 FIND_PATH(OGRE_INCLUDE_DIR Ogre.h
   PATHS $ENV{OGRE_HOME}
-  PATH_SUFFIXES include include/OGRE
+  PATH_SUFFIXES include include/OGRE Ogre.framework/Headers
 )
 FIND_LIBRARY(OGRE_LIBRARY_OPTIMIZED
-  NAMES OgreMain
+  NAMES OgreMain Ogre
   PATHS $ENV{OGRE_HOME}
   PATH_SUFFIXES lib bin/Release bin/release Release release
 )
 FIND_LIBRARY(OGRE_LIBRARY_DEBUG
-  NAMES OgreMaind OgreMain_d
+  NAMES OgreMaind OgreMain_d Ogred Ogre_d
   PATHS $ENV{OGRE_HOME}
-  PATH_SUFFIXES lib bin/Debug bin/debug Debug debug
+  PATH_SUFFIXES lib bin/Debug bin/debug Debug debug Versions/A
 )
 

code/branches/buildsystem2/cmake/LibraryConfigTardis.cmake

@@ -25 +25 @@
  #
 
-IF(UNIX)
+IF(UNIX AND NOT APPLE)
   FILE(STRINGS /etc/hostname HOSTNAME LIMIT_COUNT 1)
   IF(${HOSTNAME} MATCHES "^tardis-[a-z][0-9][0-9]$")
     SET (TARDIS ON)
   ENDIF()
-ENDIF(UNIX)
+ENDIF()
 
 IF(TARDIS)