Changeset 1872 for code/trunk/cmake/FindOggVorbis.cmake

Timestamp:

Oct 2, 2008, 7:00:54 PM (16 years ago)

Author:

rgrieder

Message:

• Modified cmake files to support library finding when using Visual Studio precompiled dependencies
• Removed vorbisenc executable from library dependency

File:

• code/trunk/cmake/FindOggVorbis.cmake (modified) (8 diffs)

code/trunk/cmake/FindOggVorbis.cmake

@@ -29 +29 @@
   /opt/include
   ../libs/libogg-1.1.3/include
+  ${DEPENDENCY_DIR}/libogg-1.1.3/include
   )
 
@@ -41 +42 @@
   /opt/include
   ../libs/libvorbis-1.2.0/include
+  ${DEPENDENCY_DIR}/libvorbis-1.2.0/include
   )
 
@@ -58 +60 @@
   /opt/lib
   ../libs/libogg-1.1.3/src/.libs
+  ${DEPENDENCY_DIR}/libogg-1.1.3/lib
   )
 
@@ -71 +74 @@
   /opt/lib
   ../libs/libvorbis-1.2.0/lib/.libs
+  ${DEPENDENCY_DIR}/libvorbis-1.2.0/lib
   )
 
-FIND_LIBRARY(VORBISENC_LIBRARY
-  NAMES vorbisenc
-  PATHS
-  /usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.1/lib
-  /usr/local/lib
-  /usr/lib
-  /sw/lib
-  /opt/local/lib
-  /opt/csw/lib
-  /opt/lib
-  ../libs/libvorbis-1.2.0/lib/.libs
-  )
+#FIND_LIBRARY(VORBISENC_LIBRARY
+#  NAMES vorbisenc
+#  PATHS
+#  /usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.1/lib
+#  /usr/local/lib
+#  /usr/lib
+#  /sw/lib
+#  /opt/local/lib
+#  /opt/csw/lib
+#  /opt/lib
+#  ../libs/libvorbis-1.2.0/lib/.libs
+#  )
 
 FIND_LIBRARY(VORBISFILE_LIBRARY
@@ -97 +101 @@
   /opt/lib
   ../libs/libvorbis-1.2.0/lib/.libs
+  ${DEPENDENCY_DIR}/libvorbis-1.2.0/lib
   )
 
@@ -123 +128 @@
 SET (VORBIS_FOUND "NO")
 
-IF (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISENC_LIBRARY AND VORBISFILE_LIBRARY)
+IF (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY)# AND VORBISENC_LIBRARY)
   SET (VORBIS_FOUND "YES")
   IF (NOT VORBIS_FIND_QUIETLY)
@@ -130 +135 @@
       MESSAGE (STATUS "  include path: ${VORBIS_INCLUDE_DIR}")
       MESSAGE (STATUS "  library path: ${VORBIS_LIBRARY}")
-      MESSAGE (STATUS "  library path: ${VORBISENC_LIBRARY}")
+      #MESSAGE (STATUS "  library path: ${VORBISENC_LIBRARY}")
       MESSAGE (STATUS "  library path: ${VORBISFILE_LIBRARY}")
       MESSAGE (STATUS "  libraries:    vorbis vorbisenc vorbisfile")
     ENDIF (VERBOSE_FIND)
   ENDIF (NOT VORBIS_FIND_QUIETLY)
-ELSE (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISENC_LIBRARY AND VORBISFILE_LIBRARY)
+ELSE (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY)# AND VORBISENC_LIBRARY)
   IF (NOT VORBIS_INCLUDE_DIR)
     MESSAGE (SEND_ERROR "Vorbis include path was not found.")
@@ -142 +147 @@
     MESSAGE (SEND_ERROR "Vorbis library \"vorbis\" was not found.")
   ENDIF (NOT VORBIS_LIBRARY)
-  IF (NOT VORBISENC_LIBRARY)
-    MESSAGE (SEND_ERROR "Vorbis library \"vorbisenc\" was not found.")
-  ENDIF (NOT VORBISENC_LIBRARY)
+  #IF (NOT VORBISENC_LIBRARY)
+  #  MESSAGE (SEND_ERROR "Vorbis library \"vorbisenc\" was not found.")
+  #ENDIF (NOT VORBISENC_LIBRARY)
   IF (NOT VORBISFILE_LIBRARY)
     MESSAGE (SEND_ERROR "Vorbis library \"vorbisfile\" was not found.")