[Orxonox-commit 3435] r8122 - code/branches/kicklib/cmake/tools
rgrieder at orxonox.net
rgrieder at orxonox.net
Sat Mar 26 17:19:59 CET 2011
Author: rgrieder
Date: 2011-03-26 17:19:59 +0100 (Sat, 26 Mar 2011)
New Revision: 8122
Modified:
code/branches/kicklib/cmake/tools/FindALUT.cmake
code/branches/kicklib/cmake/tools/FindLua5.1.cmake
code/branches/kicklib/cmake/tools/FindOGRE.cmake
Log:
Removed obsolete remains of header/library finding on OS X.
Modified: code/branches/kicklib/cmake/tools/FindALUT.cmake
===================================================================
--- code/branches/kicklib/cmake/tools/FindALUT.cmake 2011-03-26 16:06:54 UTC (rev 8121)
+++ code/branches/kicklib/cmake/tools/FindALUT.cmake 2011-03-26 16:19:59 UTC (rev 8122)
@@ -31,7 +31,7 @@
FIND_PATH(ALUT_INCLUDE_DIR alut.h
PATHS $ENV{ALUTDIR}
- PATH_SUFFIXES include include/AL Headers Headers/AL
+ PATH_SUFFIXES include include/AL
)
FIND_LIBRARY(ALUT_LIBRARY_OPTIMIZED
NAMES alut ALUT
Modified: code/branches/kicklib/cmake/tools/FindLua5.1.cmake
===================================================================
--- code/branches/kicklib/cmake/tools/FindLua5.1.cmake 2011-03-26 16:06:54 UTC (rev 8121)
+++ code/branches/kicklib/cmake/tools/FindLua5.1.cmake 2011-03-26 16:19:59 UTC (rev 8122)
@@ -56,7 +56,7 @@
# Find include path
FIND_PATH(LUA5.1_INCLUDE_DIR lua.h
PATHS $ENV{LUA5.1_DIR} $ENV{LUA_DIR}
- PATH_SUFFIXES include/lua51 include/lua5.1 include/lua include Headers
+ PATH_SUFFIXES include/lua51 include/lua5.1 include/lua include
)
# Check whether we really found Lua version 5.1
Modified: code/branches/kicklib/cmake/tools/FindOGRE.cmake
===================================================================
--- code/branches/kicklib/cmake/tools/FindOGRE.cmake 2011-03-26 16:06:54 UTC (rev 8121)
+++ code/branches/kicklib/cmake/tools/FindOGRE.cmake 2011-03-26 16:19:59 UTC (rev 8122)
@@ -22,7 +22,7 @@
FIND_PATH(OGRE_INCLUDE_DIR Ogre.h
PATHS $ENV{OGRE_HOME}
- PATH_SUFFIXES include include/OGRE Ogre.framework/Headers
+ PATH_SUFFIXES include include/OGRE
)
FIND_LIBRARY(OGRE_LIBRARY_OPTIMIZED
NAMES OgreMain Ogre
@@ -32,7 +32,7 @@
FIND_LIBRARY(OGRE_LIBRARY_DEBUG
NAMES OgreMaind OgreMain_d OgreMainD OgreMain_D Ogred Ogre_d OgreD Ogre_d
PATHS $ENV{OGRE_HOME}
- PATH_SUFFIXES lib bin/Debug bin/debug Debug debug Versions/A
+ PATH_SUFFIXES lib bin/Debug bin/debug Debug debug
)
# Inspect OgrePrerquisites.h for the version number
More information about the Orxonox-commit
mailing list