[Orxonox-commit 2864] r7567 - in code/branches/ois_update: cmake/tools src/external/ois

[youngk at orxonox.net]

Author: youngk
Date: 2010-10-20 15:17:57 +0200 (Wed, 20 Oct 2010)
New Revision: 7567

Modified:
   code/branches/ois_update/cmake/tools/CheckOGREPlugins.cmake
   code/branches/ois_update/src/external/ois/CMakeLists.txt
Log:
Changes for the compilation of OIS on the mac.

Modified: code/branches/ois_update/cmake/tools/CheckOGREPlugins.cmake
===================================================================
--- code/branches/ois_update/cmake/tools/CheckOGREPlugins.cmake	2010-10-20 12:54:08 UTC (rev 7566)
+++ code/branches/ois_update/cmake/tools/CheckOGREPlugins.cmake	2010-10-20 13:17:57 UTC (rev 7567)
@@ -52,12 +52,12 @@
     FIND_LIBRARY(OGRE_PLUGIN_${_plugin}_OPTIMIZED
       NAMES ${_plugin}
       PATHS $ENV{OGRE_HOME} $ENV{OGRE_PLUGIN_DIR}
-      PATH_SUFFIXES bin/Release bin/release Release release lib lib/OGRE bin
+      PATH_SUFFIXES bin/Release bin/release Release release lib lib/OGRE bin Ogre.framework/Resources
     )
     FIND_LIBRARY(OGRE_PLUGIN_${_plugin}_DEBUG
       NAMES ${_plugin}d ${_plugin}_d ${_plugin}
       PATHS $ENV{OGRE_HOME} $ENV{OGRE_PLUGIN_DIR}
-      PATH_SUFFIXES bin/Debug bin/debug Debug debug lib lib/OGRE bin
+      PATH_SUFFIXES bin/Debug bin/debug Debug debug lib lib/OGRE bin Ogre.framework/Resources
     )
     # We only need at least one render system. Check at the end.
     IF(NOT ${_plugin} MATCHES "RenderSystem")

Modified: code/branches/ois_update/src/external/ois/CMakeLists.txt
===================================================================
--- code/branches/ois_update/src/external/ois/CMakeLists.txt	2010-10-20 12:54:08 UTC (rev 7566)
+++ code/branches/ois_update/src/external/ois/CMakeLists.txt	2010-10-20 13:17:57 UTC (rev 7567)
@@ -64,4 +64,6 @@
 
 IF(WIN32)
   TARGET_LINK_LIBRARIES(ois_orxonox ${DIRECTX_LIBRARIES})
+ELSEIF(APPLE)
+  TARGET_LINK_LIBRARIES(ois_orxonox "/System/Library/Frameworks/IOKit.framework" "/System/Library/Frameworks/Carbon.framework")
 ENDIF()