[Orxonox-commit 3535] r8221 - in code/branches/kicklib: cmake cmake/tools src

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-04-10 03:28:27 +0200 (Sun, 10 Apr 2011)
New Revision: 8221

Modified:
   code/branches/kicklib/cmake/LibraryConfig.cmake
   code/branches/kicklib/cmake/PackageConfigMSVC.cmake
   code/branches/kicklib/cmake/tools/FindOgg.cmake
   code/branches/kicklib/cmake/tools/FindVorbis.cmake
   code/branches/kicklib/src/CMakeLists.txt
Log:
Changes that allow the Visual Studio 2010 dependencies to be used.

Modified: code/branches/kicklib/cmake/LibraryConfig.cmake
===================================================================
--- code/branches/kicklib/cmake/LibraryConfig.cmake	2011-04-09 19:24:36 UTC (rev 8220)
+++ code/branches/kicklib/cmake/LibraryConfig.cmake	2011-04-10 01:28:27 UTC (rev 8221)
@@ -57,7 +57,7 @@
     SET(_compiler_prefix msvc8)
   ELSEIF(MSVC90)
     SET(_compiler_prefix msvc9)
-  ELSEIF(MSVC100)
+  ELSEIF(MSVC10)
     SET(_compiler_prefix msvc10)
   ENDIF()
   FIND_PATH(DEPENDENCY_PACKAGE_DIR

Modified: code/branches/kicklib/cmake/PackageConfigMSVC.cmake
===================================================================
--- code/branches/kicklib/cmake/PackageConfigMSVC.cmake	2011-04-09 19:24:36 UTC (rev 8220)
+++ code/branches/kicklib/cmake/PackageConfigMSVC.cmake	2011-04-10 01:28:27 UTC (rev 8221)
@@ -56,8 +56,21 @@
 
   # Certain find scripts don't behave as ecpected to we have
   # to specify the libraries ourselves.
-  SET(TCL_LIBRARY  ${DEP_LIBRARY_DIR}/tcl85.lib CACHE FILEPATH "")
-  SET(ZLIB_LIBRARY ${DEP_LIBRARY_DIR}/zdll.lib  CACHE FILEPATH "")
+  IF(MSVC10)
+    SET(TCL_LIBRARY
+      optimized ${DEP_LIBRARY_DIR}/tcl85t.lib
+      debug     ${DEP_LIBRARY_DIR}/tcl85tg.lib
+      CACHE FILEPATH ""
+    )
+    SET(ZLIB_LIBRARY
+      optimized ${DEP_LIBRARY_DIR}/zlibwapi.lib
+      debug     ${DEP_LIBRARY_DIR}/zlibwapi_d.lib
+      CACHE FILEPATH ""
+    )
+  ELSE()
+    SET(TCL_LIBRARY  ${DEP_LIBRARY_DIR}/tcl85.lib CACHE FILEPATH "")
+    SET(ZLIB_LIBRARY ${DEP_LIBRARY_DIR}/zdll.lib  CACHE FILEPATH "")
+  ENDIF()
   # Part of Platform SDK and usually gets linked automatically
   SET(WMI_LIBRARY  wbemuuid.lib)
 

Modified: code/branches/kicklib/cmake/tools/FindOgg.cmake
===================================================================
--- code/branches/kicklib/cmake/tools/FindOgg.cmake	2011-04-09 19:24:36 UTC (rev 8220)
+++ code/branches/kicklib/cmake/tools/FindOgg.cmake	2011-04-10 01:28:27 UTC (rev 8221)
@@ -21,12 +21,12 @@
   PATH_SUFFIXES include
 )
 FIND_LIBRARY(OGG_LIBRARY_OPTIMIZED
-  NAMES ogg ogg-0
+  NAMES ogg ogg-0 libogg
   PATHS $ENV{OGGDIR}
   PATH_SUFFIXES lib
 )
 FIND_LIBRARY(OGG_LIBRARY_DEBUG
-  NAMES oggd ogg_d oggD ogg_D
+  NAMES oggd ogg_d oggD ogg_D libogg_d
   PATHS $ENV{OGGDIR}
   PATH_SUFFIXES lib
 )

Modified: code/branches/kicklib/cmake/tools/FindVorbis.cmake
===================================================================
--- code/branches/kicklib/cmake/tools/FindVorbis.cmake	2011-04-09 19:24:36 UTC (rev 8220)
+++ code/branches/kicklib/cmake/tools/FindVorbis.cmake	2011-04-10 01:28:27 UTC (rev 8221)
@@ -21,22 +21,22 @@
   PATH_SUFFIXES include
 )
 FIND_LIBRARY(VORBIS_LIBRARY_OPTIMIZED
-  NAMES vorbis vorbis-0
+  NAMES vorbis vorbis-0 libvorbis
   PATHS $ENV{VORBISDIR}
   PATH_SUFFIXES lib
 )
 FIND_LIBRARY(VORBIS_LIBRARY_DEBUG
-  NAMES vorbisd vorbis_d vorbisD vorbis_D
+  NAMES vorbisd vorbis_d vorbisD vorbis_D libvorbis_d
   PATHS $ENV{VORBISDIR}
   PATH_SUFFIXES lib
 )
 FIND_LIBRARY(VORBISFILE_LIBRARY_OPTIMIZED
-  NAMES vorbisfile vorbisfile-3
+  NAMES vorbisfile vorbisfile-3 libvorbisfile
   PATHS $ENV{VORBISDIR}
   PATH_SUFFIXES lib
 )
 FIND_LIBRARY(VORBISFILE_LIBRARY_DEBUG
-  NAMES vorbisfiled vorbisfile_d vorbisfileD vorbisfile_D
+  NAMES vorbisfiled vorbisfile_d vorbisfileD vorbisfile_D libvorbisfile_d
   PATHS $ENV{VORBISDIR}
   PATH_SUFFIXES lib
 )

Modified: code/branches/kicklib/src/CMakeLists.txt
===================================================================
--- code/branches/kicklib/src/CMakeLists.txt	2011-04-09 19:24:36 UTC (rev 8220)
+++ code/branches/kicklib/src/CMakeLists.txt	2011-04-10 01:28:27 UTC (rev 8221)
@@ -40,7 +40,7 @@
 ADD_COMPILER_FLAGS("-DBOOST_ALL_DYN_LINK" WIN32 LINK_BOOST_DYNAMIC)
 #ADD_COMPILER_FLAGS("-DENET_DLL"           WIN32 LINK_ENET_DYNAMIC)
 ADD_COMPILER_FLAGS("-DLUA_BUILD_AS_DLL"   WIN32 LINK_LUA5.1_DYNAMIC)
-ADD_COMPILER_FLAGS("-DZLIB_DLL"           WIN32 LINK_ZLIB_DYNAMIC)
+ADD_COMPILER_FLAGS("-DZLIB_DLL -DZLIB_WINAPI" WIN32 LINK_ZLIB_DYNAMIC)
 # If no defines are specified, these libs get linked dynamically
 ADD_COMPILER_FLAGS("-DCEGUI_STATIC -DTOLUA_STATIC" WIN32 NOT LINK_CEGUI_DYNAMIC)
 ADD_COMPILER_FLAGS("-DOGRE_STATIC_LIB"    WIN32 NOT LINK_OGRE_DYNAMIC)