[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdemultimedia/cmake/modules
From:       Laurent Montel <montel () kde ! org>
Date:       2007-08-06 19:10:02
Message-ID: 1186427402.405425.23906.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 697095 by mlaurent:

Remove not necessary path


 M  +0 -8      FindFFmpeg.cmake  
 M  +3 -14     FindFlac.cmake  
 M  +5 -19     FindTheora.cmake  
 M  +3 -13     FindTunePimp.cmake  


--- trunk/KDE/kdemultimedia/cmake/modules/FindFFmpeg.cmake #697094:697095
@@ -29,32 +29,24 @@
   find_path(FFMPEG_INCLUDE_DIR ffmpeg/avcodec.h
     PATHS
     ${_FFMPEGIncDir}
-    /usr/include
-    /usr/local/include
     NO_DEFAULT_PATH
   )
 
   find_library(AVCODEC_LIBRARIES NAMES avcodec
     PATHS
     ${_FFMPEGLinkDir}
-    /usr/lib
-    /usr/local/lib
     NO_DEFAULT_PATH
   )
 
   find_library(AVFORMAT_LIBRARIES NAMES avformat
     PATHS
     ${_FFMPEGLinkDir}
-    /usr/lib
-    /usr/local/lib
     NO_DEFAULT_PATH
   )
 
   find_library(AVUTIL_LIBRARIES NAMES avutil
     PATHS
     ${_FFMPEGLinkDir}
-    /usr/lib
-    /usr/local/lib
     NO_DEFAULT_PATH
   )
 
--- trunk/KDE/kdemultimedia/cmake/modules/FindFlac.cmake #697094:697095
@@ -17,22 +17,11 @@
     set(Flac_FIND_QUIETLY TRUE)	
 endif(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES)
 
-FIND_PATH(FLAC_INCLUDE_DIR FLAC/metadata.h
-  /usr/include
-  /usr/local/include
-)
+FIND_PATH(FLAC_INCLUDE_DIR FLAC/metadata.h)
 
-FIND_LIBRARY(FLAC_LIBRARIES NAMES FLAC
-  PATHS
-  /usr/lib
-  /usr/local/lib
-)
+FIND_LIBRARY(FLAC_LIBRARIES NAMES FLAC )
 
-FIND_LIBRARY(FLAC_OGG_LIBRARY NAMES OggFLAC
-  PATHS
-  /usr/lib
-  /usr/local/lib 
-  )
+FIND_LIBRARY(FLAC_OGG_LIBRARY NAMES OggFLAC)
 
 check_library_exists(FLAC FLAC__stream_encoder_set_write_callback "" \
HAVE_STREAM_ENCODER_WRITE_CALLBACK)  
--- trunk/KDE/kdemultimedia/cmake/modules/FindTheora.cmake #697094:697095
@@ -14,28 +14,14 @@
 set(THEORA_LIBRARY)
 set(THEORA_INCLUDE_DIR)
 
-FIND_PATH(THEORA_INCLUDE_DIR theora/theora.h
-	/usr/include
-	/usr/local/include
-)
+FIND_PATH(THEORA_INCLUDE_DIR theora/theora.h)
 
-FIND_LIBRARY(THEORA_OGG_LIBRARIES NAMES ogg
-	PATHS
-	/usr/lib
-	/usr/local/lib
-)
+FIND_LIBRARY(THEORA_OGG_LIBRARIES NAMES ogg )
 
-FIND_LIBRARY(THEORA_VORBIS_LIBRARIES NAMES vorbis
-	PATHS
-	/usr/lib
-	/usr/local/lib
-)
-FIND_LIBRARY(THEORA_LIB_LIBRARIES NAMES theora
-	PATHS
-	/usr/lib
-	/usr/local/lib
-)
+FIND_LIBRARY(THEORA_VORBIS_LIBRARIES NAMES vorbis)
 
+FIND_LIBRARY(THEORA_LIB_LIBRARIES NAMES theora)
+
 if(THEORA_LIB_LIBRARIES AND THEORA_VORBIS_LIBRARIES AND THEORA_OGG_LIBRARIES)
 	set(THEORA_LIBRARY ${THEORA_LIB_LIBRARIES} ${THEORA_OGG_LIBRARIES} \
${THEORA_VORBIS_LIBRARIES})  endif(THEORA_LIB_LIBRARIES AND THEORA_VORBIS_LIBRARIES \
                AND THEORA_OGG_LIBRARIES)
--- trunk/KDE/kdemultimedia/cmake/modules/FindTunePimp.cmake #697094:697095
@@ -14,24 +14,14 @@
 set(TUNEPIMP_LIBRARY)
 set(TUNEPIMP_INCLUDE_DIR)
 
-FIND_PATH(TUNEPIMP_INCLUDE_DIR tunepimp/tp_c.h
-	/usr/include
-	/usr/local/include
-)
+FIND_PATH(TUNEPIMP_INCLUDE_DIR tunepimp/tp_c.h)
 
 # Search tunepimp-0.5 
 if(NOT TUNEPIMP_INCLUDE_DIR)
-    FIND_PATH(TUNEPIMP_INCLUDE_DIR tunepimp-0.5/tp_c.h
-        /usr/include
-        /usr/local/include
-    )
+    FIND_PATH(TUNEPIMP_INCLUDE_DIR tunepimp-0.5/tp_c.h)
 endif(NOT TUNEPIMP_INCLUDE_DIR)	
 
-FIND_LIBRARY(TUNEPIMP_LIBRARIES NAMES tunepimp
-	PATHS
-	/usr/lib
-	/usr/local/lib
-)
+FIND_LIBRARY(TUNEPIMP_LIBRARIES NAMES tunepimp)
 
 if(TUNEPIMP_INCLUDE_DIR AND TUNEPIMP_LIBRARIES)
    MESSAGE( STATUS "tunepimp found: includes in ${TUNEPIMP_INCLUDE_DIR}, library in \
${TUNEPIMP_LIBRARIES}")


[prev in list] [next in list] [prev in thread] [next in thread]