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

Timestamp:

Jan 12, 2009, 1:33:55 PM (15 years ago)

Author:

rgrieder

Message:

• Use $ENV{BOOST_ROOT} to find boost if possible
• Set TOLUA_PARSER_WORKING_DIRECTORY now defaults to ${CMAKE_RUNTIME_OUTPUT_PATH}
• Added bin/release, bin/debug, release and debug to the Ogre library prefix paths
• Lots of small fixes and changes

File:

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

code/branches/buildsystem2/cmake/FindOggVorbis.cmake

@@ -17 +17 @@
 # Most of all rewritten by Adrian Friedli
 #                 > www.orxonox.net <
+
+INCLUDE(FindPackageHandleStandardArgs)
+INCLUDE(HandleLibraryTypes)
 
 SET(OGG_SEARCH_PATHS
@@ -41 +44 @@
   PATH_SUFFIXES lib
 )
-FIND_LIBRARY(OGG_LIBRARY_DEBUG NAMES ogg_${LIBRARY_DEBUG_POSTFIX}
+FIND_LIBRARY(OGG_LIBRARY_DEBUG NAMES ogg${LIBRARY_DEBUG_POSTFIX}
   PATHS ${OGG_SEARCH_PATHS}
   PATH_SUFFIXES lib
@@ -49 +52 @@
   PATH_SUFFIXES lib
 )
-FIND_LIBRARY(VORBIS_LIBRARY_DEBUG NAMES vorbis_${LIBRARY_DEBUG_POSTFIX}
+FIND_LIBRARY(VORBIS_LIBRARY_DEBUG NAMES vorbis${LIBRARY_DEBUG_POSTFIX}
   PATHS ${OGG_SEARCH_PATHS}
   PATH_SUFFIXES lib
@@ -57 +60 @@
   PATH_SUFFIXES lib
 )
-FIND_LIBRARY(VORBISFILE_LIBRARY_DEBUG NAMES vorbisfile_${LIBRARY_DEBUG_POSTFIX}
+FIND_LIBRARY(VORBISFILE_LIBRARY_DEBUG NAMES vorbisfile${LIBRARY_DEBUG_POSTFIX}
   PATHS ${OGG_SEARCH_PATHS}
   PATH_SUFFIXES lib
@@ -70 +73 @@
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(VORBIS DEFAULT_MSG
   VORBIS_LIBRARY_OPTIMIZED
+  VORBIS_INCLUDE_DIR
+)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(VORBISFILE DEFAULT_MSG
   VORBISFILE_LIBRARY_OPTIMIZED
   VORBIS_INCLUDE_DIR