Changeset 2579 for code/branches/buildsystem2/cmake/FindOggVorbis.cmake

Timestamp:

Jan 8, 2009, 9:37:41 PM (15 years ago)

Author:

rgrieder

Message:

• Equipped find scripts with debug/optimized functions. If you have different debug prefixes on your platform simply change ${LIBRARY_DEBUG_POSTFIX} ("_d" default).
• Clean up in ConfigMSVC.cmake and ConfigMinGW.cmake
• Also had a good look at the MinGW libraries according to the libs_1889_mingw.zip (no warranty at all, hope I got them all)
• INSTALL commands are currently limited to non Windows platforms (don't yet know why it doesn't work)

File:

• code/branches/buildsystem2/cmake/FindOggVorbis.cmake (modified) (4 diffs)

code/branches/buildsystem2/cmake/FindOggVorbis.cmake

@@ -11 +11 @@
 #  VORBISFILE_LIBRARY
 #
-# $OGGVORBISDIR is an environment variable used for finding ogg/vorbis.
+# $OGGDIR and $VORBISDIR are environment variables used
+# for finding ogg/vorbis.
 #
 # Several changes and additions by Fabian 'x3n' Landau
@@ -18 +19 @@
 
 SET(OGG_SEARCH_PATHS
-  $ENV{OGGVORBISDIR}
+  $ENV{OGGDIR}
+  $ENV{VORBISDIR}
   /usr/local
   /usr
@@ -31 +33 @@
   PATH_SUFFIXES include
 )
-
 FIND_PATH(VORBIS_INCLUDE_DIR vorbis/codec.h
   PATHS ${OGG_SEARCH_PATHS}
   PATH_SUFFIXES include
 )
-
-FIND_LIBRARY(OGG_LIBRARY NAMES ogg
+FIND_LIBRARY(OGG_LIBRARY_OPTIMIZED NAMES ogg
   PATHS ${OGG_SEARCH_PATHS}
   PATH_SUFFIXES lib
 )
-
-FIND_LIBRARY(VORBIS_LIBRARY NAMES vorbis
+FIND_LIBRARY(OGG_LIBRARY_DEBUG NAMES ogg_${LIBRARY_DEBUG_POSTFIX}
   PATHS ${OGG_SEARCH_PATHS}
   PATH_SUFFIXES lib
 )
-
-#FIND_LIBRARY(VORBISENC_LIBRARY NAMES vorbisenc
-#  PATHS ${OGG_SEARCH_PATHS}
-#  PATH_SUFFIXES lib
-#)
-
-FIND_LIBRARY(VORBISFILE_LIBRARY NAMES vorbisfile
+FIND_LIBRARY(VORBIS_LIBRARY_OPTIMIZED NAMES vorbis
+  PATHS ${OGG_SEARCH_PATHS}
+  PATH_SUFFIXES lib
+)
+FIND_LIBRARY(VORBIS_LIBRARY_DEBUG NAMES vorbis_${LIBRARY_DEBUG_POSTFIX}
+  PATHS ${OGG_SEARCH_PATHS}
+  PATH_SUFFIXES lib
+)
+FIND_LIBRARY(VORBISFILE_LIBRARY_OPTIMIZED NAMES vorbisfile
+  PATHS ${OGG_SEARCH_PATHS}
+  PATH_SUFFIXES lib
+)
+FIND_LIBRARY(VORBISFILE_LIBRARY_DEBUG NAMES vorbisfile_${LIBRARY_DEBUG_POSTFIX}
   PATHS ${OGG_SEARCH_PATHS}
   PATH_SUFFIXES lib
@@ -59 +64 @@
 # handle the QUIETLY and REQUIRED arguments and set *_FOUND to TRUE if
 # all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OGG DEFAULT_MSG OGG_LIBRARY OGG_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OGG DEFAULT_MSG
+  OGG_LIBRARY_OPTIMIZED
+  OGG_INCLUDE_DIR
+)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(VORBIS DEFAULT_MSG
-  VORBIS_LIBRARY
-  VORBISFILE_LIBRARY
-  #VORBISENC_LIBRARY
+  VORBIS_LIBRARY_OPTIMIZED
+  VORBISFILE_LIBRARY_OPTIMIZED
   VORBIS_INCLUDE_DIR
 )
 
+# Set optimized and debug libraries
+HandleLibraryTypes(OGG)
+HandleLibraryTypes(VORBIS)
+HandleLibraryTypes(VORBISFILE)
+
 MARK_AS_ADVANCED(
   OGG_LIBRARY
+  OGG_LIBRARY_OPTIMIZED
+  OGG_LIBRARY_DEBUG
   OGG_INCLUDE_DIR
   VORBIS_LIBRARY
+  VORBIS_LIBRARY_OPTIMIZED
+  VORBIS_LIBRARY_DEBUG
   VORBISFILE_LIBRARY
-  #VORBISENC_LIBRARY
+  VORBISFILE_LIBRARY_OPTIMIZED
+  VORBISFILE_LIBRARY_DEBUG
   VORBIS_INCLUDE_DIR
 )