Changeset 2616 for code/branches/buildsystem2/cmake/FindOgg.cmake

Timestamp:

Jan 29, 2009, 10:55:29 PM (16 years ago)

Author:

rgrieder

Message:

• Split FindOggVorbis.cmake in two. Having them in one file doesn't make sense, we can group it somewhere else.
• Updated all find scripts
• Removed all standard paths (like /usr /usr/local, etc.) because they're already searched by CMake anyway
• Several workarounds for certain libraries when using the find script in the CMake module path.

File:

• code/branches/buildsystem2/cmake/FindOgg.cmake (moved) (moved from code/branches/buildsystem2/cmake/FindOggVorbis.cmake) (2 diffs)

code/branches/buildsystem2/cmake/FindOgg.cmake

@@ -5 +5 @@
 #  OGG_INCLUDE_DIR
 #  OGG_LIBRARY
-#  VORBIS_FOUND - system has vorbis
-#  VORBIS_INCLUDE_DIR
-#  VORBIS_LIBRARY
-#  VORBISENC_LIBRARY
-#  VORBISFILE_LIBRARY
 #
-# $OGGDIR and $VORBISDIR are environment variables used
-# for finding ogg/vorbis.
+# $OGGDIR is an environment variable used
+# for finding ogg.
 #
 # Several changes and additions by Fabian 'x3n' Landau
@@ -21 +16 @@
 INCLUDE(HandleLibraryTypes)
 
-SET(OGG_SEARCH_PATHS
-  $ENV{OGGDIR}
-  $ENV{VORBISDIR}
-  /usr/local
-  /usr
-  /sw
-  /opt/local
-  /opt/csw
-  /opt
-)
-
 FIND_PATH(OGG_INCLUDE_DIR ogg/ogg.h
-  PATHS ${OGG_SEARCH_PATHS}
+  PATHS $ENV{OGGDIR}
   PATH_SUFFIXES include
 )
 FIND_PATH(VORBIS_INCLUDE_DIR vorbis/codec.h
-  PATHS ${OGG_SEARCH_PATHS}
+  PATHS $ENV{OGGDIR}
   PATH_SUFFIXES include
 )
-FIND_LIBRARY(OGG_LIBRARY_OPTIMIZED NAMES ogg
-  PATHS ${OGG_SEARCH_PATHS}
+FIND_LIBRARY(OGG_LIBRARY_OPTIMIZED
+  NAMES ogg
+  PATHS $ENV{OGGDIR}
   PATH_SUFFIXES lib
 )
-FIND_LIBRARY(OGG_LIBRARY_DEBUG NAMES ogg${LIBRARY_DEBUG_POSTFIX}
-  PATHS ${OGG_SEARCH_PATHS}
-  PATH_SUFFIXES lib
-)
-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}
+FIND_LIBRARY(OGG_LIBRARY_DEBUG
+  NAMES oggd ogg_d
+  PATHS $ENV{VORBISDIR}
   PATH_SUFFIXES lib
 )
 
-# handle the QUIETLY and REQUIRED arguments and set *_FOUND to TRUE if
-# all listed variables are TRUE
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OGG DEFAULT_MSG
+# Handle the REQUIRED argument and set OGG_FOUND
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ogg DEFAULT_MSG
+  OGG_INCLUDE_DIR
   OGG_LIBRARY_OPTIMIZED
-  OGG_INCLUDE_DIR
-)
-SET(VORBIS_FIND_REQUIRED ON)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(VORBIS DEFAULT_MSG
-  VORBIS_LIBRARY_OPTIMIZED
-  VORBIS_INCLUDE_DIR
-)
-SET(VORBISFILE_FIND_REQUIRED ON)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(VORBISFILE DEFAULT_MSG
-  VORBISFILE_LIBRARY_OPTIMIZED
-  VORBIS_INCLUDE_DIR
 )
 
-# Set optimized and debug libraries
+# Collect optimized and debug libraries
 HANDLE_LIBRARY_TYPES(OGG)
-HANDLE_LIBRARY_TYPES(VORBIS)
-HANDLE_LIBRARY_TYPES(VORBISFILE)
 
 MARK_AS_ADVANCED(
-  OGG_LIBRARY
+  OGG_INCLUDE_DIR
   OGG_LIBRARY_OPTIMIZED
   OGG_LIBRARY_DEBUG
-  OGG_INCLUDE_DIR
-  VORBIS_LIBRARY
-  VORBIS_LIBRARY_OPTIMIZED
-  VORBIS_LIBRARY_DEBUG
-  VORBISFILE_LIBRARY
-  VORBISFILE_LIBRARY_OPTIMIZED
-  VORBISFILE_LIBRARY_DEBUG
-  VORBIS_INCLUDE_DIR
 )