Changeset 2648

Timestamp:

Feb 12, 2009, 3:00:19 PM (16 years ago)

Author:

rgrieder

Message:

• More debug library names
• Fixed typo in FindOgg

Location:

code/branches/buildsystem2/cmake

Files:

• FindALUT.cmake (modified) (1 diff)
• FindCEGUI.cmake (modified) (1 diff)
• FindENet.cmake (modified) (1 diff)
• FindLua.cmake (modified) (3 diffs)
• FindOGRE.cmake (modified) (1 diff)
• FindOgg.cmake (modified) (2 diffs)
• FindVorbis.cmake (modified) (2 diffs)

code/branches/buildsystem2/cmake/FindALUT.cmake

@@ -59 +59 @@
   )
   FIND_LIBRARY(ALUT_LIBRARY_DEBUG
-    NAMES alutd alut_d
+    NAMES alutd alut_d alutD alut_D
     PATHS $ENV{ALUTDIR}
     PATH_SUFFIXES lib libs

code/branches/buildsystem2/cmake/FindCEGUI.cmake

@@ -43 +43 @@
 )
 FIND_LIBRARY(CEGUI_LIBRARY_DEBUG
-  NAMES CEGUIBased CEGUIBase_d CEGUId CEGUI_d
+  NAMES
+    CEGUIBased CEGUIBase_d CEGUIBaseD CEGUIBase_D
+    CEGUId CEGUI_d CEGUID CEGUI_D
   PATHS $ENV{CEGUIDIR}
   PATH_SUFFIXES lib bin

code/branches/buildsystem2/cmake/FindENet.cmake

@@ -29 +29 @@
 )
 FIND_LIBRARY(ENET_LIBRARY_DEBUG
-  NAMES enetd enet_d
+  NAMES enetd enet_d enet_D
   PATHS $ENV{ENETDIR}
   PATH_SUFFIXES lib

code/branches/buildsystem2/cmake/FindLua.cmake

@@ -74 +74 @@
     FIND_LIBRARY(LUA_5.1_LIBRARY_DEBUG
       NAMES lua51d lua51_d lua5.1d lua5.1_d luad lua_d
+            lua51D lua51_D lua5.1D lua5.1_D luad lua_D
       PATHS $ENV{LUA_DIR}
       PATH_SUFFIXES lib64 lib
@@ -105 +106 @@
     FIND_LIBRARY(LUA_5.0_LUA_LIBRARY_DEBUG
       NAMES lua50d lua50_d lua5.0d lua5.0_d lua5d lua5_d luad lua_d
+            lua50D lua50_D lua5.0D lua5.0_D lua5d lua5_D luaD lua_D
       PATHS $ENV{LUA_DIR}
       PATH_SUFFIXES lib64 lib
@@ -123 +125 @@
         NAMES lualib50d lualib50_d lualib5.0d lualib5.0_d
               lualib5d lualib5_d lualibd lualib_d
+              lualib50D lualib50_D lualib5.0D lualib5.0_D
+              lualib5D lualib5_D lualibD lualib_D
         PATHS $ENV{LUALIB_DIR} $ENV{LUA_DIR}
         PATH_SUFFIXES lib64 lib

code/branches/buildsystem2/cmake/FindOGRE.cmake

@@ -31 +31 @@
 )
 FIND_LIBRARY(OGRE_LIBRARY_DEBUG
-  NAMES OgreMaind OgreMain_d Ogred Ogre_d
+  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

code/branches/buildsystem2/cmake/FindOgg.cmake

@@ -21 +21 @@
   PATH_SUFFIXES include
 )
-FIND_PATH(VORBIS_INCLUDE_DIR vorbis/codec.h
-  PATHS $ENV{OGGDIR}
-  PATH_SUFFIXES include
-)
 FIND_LIBRARY(OGG_LIBRARY_OPTIMIZED
   NAMES ogg
@@ -31 +27 @@
 )
 FIND_LIBRARY(OGG_LIBRARY_DEBUG
-  NAMES oggd ogg_d
-  PATHS $ENV{VORBISDIR}
+  NAMES oggd ogg_d oggD ogg_D
+  PATHS $ENV{OGGDIR}
   PATH_SUFFIXES lib
 )

code/branches/buildsystem2/cmake/FindVorbis.cmake

@@ -27 +27 @@
 )
 FIND_LIBRARY(VORBIS_LIBRARY_DEBUG
-  NAMES vorbisd vorbis_d
+  NAMES vorbisd vorbis_d vorbisD vorbis_D
   PATHS $ENV{VORBISDIR}
   PATH_SUFFIXES lib
@@ -37 +37 @@
 )
 FIND_LIBRARY(VORBISFILE_LIBRARY_DEBUG
-  NAMES vorbisfiled vorbisfile_d
+  NAMES vorbisfiled vorbisfile_d vorbisfileD vorbisfile_D
   PATHS $ENV{VORBISDIR}
   PATH_SUFFIXES lib