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

List:       kde-commits
Subject:    KDE/kdemultimedia/cmake/modules
From:       Allen Winter <winter () kde ! org>
Date:       2007-12-16 13:56:53
Message-ID: 1197813413.082006.25217.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 749093 by winterz:

major rewrite:
 uses cache variables
 looks in cdda subdir for includes (using the PATH_SUFFIXES)
 standard messages


 M  +16 -28    FindCdparanoia.cmake  


--- trunk/KDE/kdemultimedia/cmake/modules/FindCdparanoia.cmake #749092:749093
@@ -7,42 +7,30 @@
 #
 
 # Copyright (c) 2006, Richard Laerkaeng, <richard@goteborg.utfors.se>
+# Copyright (c) 2007, Allen Winter, <winter@kde.org>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-FIND_PROGRAM(CDPARANOIA_EXECUTABLE NAMES cdparanoia 
-# these paths should be searched automatically by cmake, so no need to specify them explicitely
-# but I'm not too sure about the /sbin ones, Alex
-#    PATHS /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin
-)
+if (CDPARANOIA_INCLUDE_DIR AND CDPARANOIA_LIBRARIES)
+  # in cache already
+  SET(CDPARANOIA_FOUND TRUE)
 
-FIND_PATH(CDPARANOIA_INCLUDE_DIR cdda_interface.h
-# /usr/include and /usr/local/include are also searched automatically, Alex
-#    /usr/include /usr/local/include
-)
+else (CDPARANOIA_INCLUDE_DIR AND CDPARANOIA_LIBRARIES)
 
-FIND_LIBRARY(CDPARANOIA_LIBRARY NAMES cdda_paranoia)
-FIND_LIBRARY(CDPARANOIA_IF_LIBRARY NAMES cdda_interface)
+  FIND_PATH(CDPARANOIA_INCLUDE_DIR cdda_interface.h PATH_SUFFIXES cdda)
 
+  FIND_LIBRARY(CDPARANOIA_LIBRARY NAMES cdda_paranoia)
+  FIND_LIBRARY(CDPARANOIA_IF_LIBRARY NAMES cdda_interface)
 
-IF (CDPARANOIA_LIBRARY AND CDPARANOIA_IF_LIBRARY  AND CDPARANOIA_INCLUDE_DIR)
-    SET(CDPARANOIA_LIBRARIES ${CDPARANOIA_LIBRARY} ${CDPARANOIA_IF_LIBRARY}  "-lm")
-    SET(CDPARANOIA_FOUND TRUE)
+  IF (CDPARANOIA_LIBRARY AND CDPARANOIA_IF_LIBRARY)
+    SET(CDPARANOIA_LIBRARIES ${CDPARANOIA_LIBRARY} ${CDPARANOIA_IF_LIBRARY} "-lm")
+  ENDIF (CDPARANOIA_LIBRARY AND CDPARANOIA_IF_LIBRARY)
 
-    IF (NOT Cdparanoia_FIND_QUIETLY)
-      MESSAGE(STATUS "Found cdparanoia: ${CDPARANOIA_LIBRARIES}")
-    ENDIF(NOT Cdparanoia_FIND_QUIETLY)
+  INCLUDE(FindPackageHandleStandardArgs)
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Cdparanoia DEFAULT_MSG
+                                    CDPARANOIA_LIBRARIES CDPARANOIA_INCLUDE_DIR)
 
-ELSE  (CDPARANOIA_LIBRARY AND CDPARANOIA_IF_LIBRARY  AND CDPARANOIA_INCLUDE_DIR)
+  MARK_AS_ADVANCED(CDPARANOIA_INCLUDE_DIR CDPARANOIA_LIBRARIES)
 
-    SET(CDPARANOIA_FOUND FALSE)
-    IF (Cdparanoia_FIND_REQUIRED)
-        MESSAGE(FATAL_ERROR "Could not find cdparanoia")
-    ENDIF (Cdparanoia_FIND_REQUIRED)
-    IF (NOT Cdparanoia_FIND_QUIETLY)
-       MESSAGE(STATUS "Did not find cdparanoia")
-    ENDIF(NOT Cdparanoia_FIND_QUIETLY)
-ENDIF (CDPARANOIA_LIBRARY AND CDPARANOIA_IF_LIBRARY  AND CDPARANOIA_INCLUDE_DIR)
-
-
+endif (CDPARANOIA_INCLUDE_DIR AND CDPARANOIA_LIBRARIES)
[prev in list] [next in list] [prev in thread] [next in thread]