[Orxonox-commit 3381] r8068 - in code/branches/kicklib/cmake: . tools

[landauf at orxonox.net]

Author: landauf
Date: 2011-03-13 15:54:54 +0100 (Sun, 13 Mar 2011)
New Revision: 8068

Modified:
   code/branches/kicklib/cmake/PackageConfigMinGW.cmake
   code/branches/kicklib/cmake/tools/FindOgg.cmake
   code/branches/kicklib/cmake/tools/FindPOCO.cmake
   code/branches/kicklib/cmake/tools/FindVorbis.cmake
Log:
adjusted a few library names and search paths for mingw dependencies

Modified: code/branches/kicklib/cmake/PackageConfigMinGW.cmake
===================================================================
--- code/branches/kicklib/cmake/PackageConfigMinGW.cmake	2011-03-12 23:00:38 UTC (rev 8067)
+++ code/branches/kicklib/cmake/PackageConfigMinGW.cmake	2011-03-13 14:54:54 UTC (rev 8068)
@@ -47,6 +47,6 @@
   # Certain find scripts don't behave as ecpected to we have
   # to specify the libraries ourselves.
   SET(TCL_LIBRARY  ${DEP_BINARY_DIR}/tcl85.dll CACHE FILEPATH "")
-  SET(ZLIB_LIBRARY ${DEP_BINARY_DIR}/zlib1.dll CACHE FILEPATH "")
+  SET(ZLIB_LIBRARY ${DEP_BINARY_DIR}/libzlib.dll CACHE FILEPATH "")
 
 ENDIF(MINGW)

Modified: code/branches/kicklib/cmake/tools/FindOgg.cmake
===================================================================
--- code/branches/kicklib/cmake/tools/FindOgg.cmake	2011-03-12 23:00:38 UTC (rev 8067)
+++ code/branches/kicklib/cmake/tools/FindOgg.cmake	2011-03-13 14:54:54 UTC (rev 8068)
@@ -21,7 +21,7 @@
   PATH_SUFFIXES include
 )
 FIND_LIBRARY(OGG_LIBRARY_OPTIMIZED
-  NAMES ogg
+  NAMES ogg ogg-0
   PATHS $ENV{OGGDIR}
   PATH_SUFFIXES lib
 )

Modified: code/branches/kicklib/cmake/tools/FindPOCO.cmake
===================================================================
--- code/branches/kicklib/cmake/tools/FindPOCO.cmake	2011-03-12 23:00:38 UTC (rev 8067)
+++ code/branches/kicklib/cmake/tools/FindPOCO.cmake	2011-03-13 14:54:54 UTC (rev 8068)
@@ -28,7 +28,7 @@
 
 FIND_PATH(POCO_INCLUDE_DIR Poco/Poco.h
   PATHS $ENV{POCODIR}
-  PATH_SUFFIXES include
+  PATH_SUFFIXES include Foundation/include
 )
 FIND_LIBRARY(POCO_LIBRARY_OPTIMIZED
   NAMES PocoFoundation

Modified: code/branches/kicklib/cmake/tools/FindVorbis.cmake
===================================================================
--- code/branches/kicklib/cmake/tools/FindVorbis.cmake	2011-03-12 23:00:38 UTC (rev 8067)
+++ code/branches/kicklib/cmake/tools/FindVorbis.cmake	2011-03-13 14:54:54 UTC (rev 8068)
@@ -21,7 +21,7 @@
   PATH_SUFFIXES include
 )
 FIND_LIBRARY(VORBIS_LIBRARY_OPTIMIZED
-  NAMES vorbis
+  NAMES vorbis vorbis-0
   PATHS $ENV{VORBISDIR}
   PATH_SUFFIXES lib
 )
@@ -31,7 +31,7 @@
   PATH_SUFFIXES lib
 )
 FIND_LIBRARY(VORBISFILE_LIBRARY_OPTIMIZED
-  NAMES vorbisfile
+  NAMES vorbisfile vorbisfile-3
   PATHS $ENV{VORBISDIR}
   PATH_SUFFIXES lib
 )