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

List:       kde-commits
Subject:    extragear/multimedia/amarok
From:       Jeff Mitchell <kde-dev () emailgoeshere ! com>
Date:       2009-03-13 21:48:16
Message-ID: 1236980896.864957.25346.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 939129 by mitchell:

Fix CMake checks, so that Taglib-Extras can be detected at runtime and default to on.


 M  +2 -2      CMakeLists.txt  
 A             cmake/modules/FindTaglib-Extras.cmake   cmake/modules/FindTaglibExtras.cmake#939121
 M  +2 -43     cmake/modules/FindTaglib.cmake  
 D             cmake/modules/FindTaglibExtras.cmake  
 M  +4 -1      src/CMakeLists.txt  
 M  +6 -2      utilities/collectionscanner/CMakeLists.txt  


--- trunk/extragear/multimedia/amarok/CMakeLists.txt #939128:939129
@@ -8,7 +8,7 @@
 option(WITH_UTILITIES "Enable building of utilities" ON)
 option(WITH_PLAYER "Enable building of main Amarok player" ON)
 option(WITH_MP3TUNES "Enable mp3tunes in the Amarok player, requires multiple extra dependencies" ON)
-option(WITH_TAGLIB-EXTRAS "Enable extra tag reading/writing formats" Off)
+option(WITH_TAGLIB-EXTRAS "Enable extra tag reading/writing formats" ON)
 
 include(CheckLibraryExists)
 check_library_exists(dl dlopen "" LIBDL_FOUND)
@@ -18,7 +18,7 @@
 
 if( WITH_TAGLIB-EXTRAS )
     set(TAGLIB-EXTRAS_MIN_VERSION "0.1")
-    find_package(TaglibExtras)
+    find_package(Taglib-Extras)
     if( TAGLIB-EXTRAS_FOUND )
         add_definitions( -DTAGLIB_EXTRAS_FOUND )
     endif( TAGLIB-EXTRAS_FOUND )
--- trunk/extragear/multimedia/amarok/cmake/modules/FindTaglib.cmake #939128:939129
@@ -117,50 +117,9 @@
     ENDIF(NOT WIN32)
   
   INCLUDE(FindPackageMessage)
+  INCLUDE(FindPackageHandleStandardArgs)
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Taglib DEFAULT_MSG TAGLIB_INCLUDES TAGLIB_LIBRARIES)
 
-  IF("DEFAULT_MSG" STREQUAL "DEFAULT_MSG")
-    SET(_FAIL_MESSAGE "Could NOT find Taglib")
-  ELSE("DEFAULT_MSG" STREQUAL "DEFAULT_MSG")
-    SET(_FAIL_MESSAGE "DEFAULT_MSG")
-  ENDIF("DEFAULT_MSG" STREQUAL "DEFAULT_MSG")
-
-  STRING(TOUPPER Taglib _NAME_UPPER)
-
-  # collect all variables which were not found, so they can be printed, so the
-  # user knows better what went wrong (#6375)
-  SET(MISSING_VARS "")
-  SET(DETAILS "")
-  SET(${_NAME_UPPER}_FOUND TRUE)
-  IF(NOT TAGLIB_INCLUDES OR TAGLIB_LIBRARIES)
-    SET(${_NAME_UPPER}_FOUND FALSE)
-    SET(MISSING_VARS " TAGLIB_INCLUDES TAGLIB_LIBRARIES")
-  ELSE(NOT TAGLIB_INCLUDES OR TAGLIB_LIBRARIES)
-    SET(DETAILS "${DETAILS}[${TAGLIB_INCLUDES} ${TAGLIB_LIBRARIES}]")
-  ENDIF(NOT TAGLIB_INCLUDES OR TAGLIB_LIBRARIES)
-
-  # check if all passed variables are valid
-  FOREACH(_CURRENT_VAR ${TAGLIB_INCLUDES} ${TAGLIB_LIBRARIES})
-    IF(NOT ${_CURRENT_VAR})
-      SET(${_NAME_UPPER}_FOUND FALSE)
-      SET(MISSING_VARS "${MISSING_VARS} ${_CURRENT_VAR}")
-    ELSE(NOT ${_CURRENT_VAR})
-      SET(DETAILS "${DETAILS}[${${_CURRENT_VAR}}]")
-    ENDIF(NOT ${_CURRENT_VAR})
-  ENDFOREACH(_CURRENT_VAR)
-
-  IF (${_NAME_UPPER}_FOUND)
-    FIND_PACKAGE_MESSAGE(Taglib "Found Taglib: ${TAGLIB_INCLUDES} ${TAGLIB_LIBRARIES}" "${DETAILS}")
-  ELSE (${_NAME_UPPER}_FOUND)
-    IF (Taglib_FIND_REQUIRED)
-        MESSAGE(FATAL_ERROR "${_FAIL_MESSAGE} (missing: ${MISSING_VARS})")
-    ELSE (Taglib_FIND_REQUIRED)
-      IF (NOT Taglib_FIND_QUIETLY)
-        MESSAGE(STATUS "${_FAIL_MESSAGE}  (missing: ${MISSING_VARS})")
-      ENDIF (NOT Taglib_FIND_QUIETLY)
-    ENDIF (Taglib_FIND_REQUIRED)
-  ENDIF (${_NAME_UPPER}_FOUND)
-
-  SET(${_NAME_UPPER}_FOUND ${${_NAME_UPPER}_FOUND} PARENT_SCOPE)
 endif(TAGLIBCONFIG_EXECUTABLE)
 
 
--- trunk/extragear/multimedia/amarok/src/CMakeLists.txt #939128:939129
@@ -48,11 +48,14 @@
     ${CMAKE_CURRENT_BINARY_DIR} #for amarokconfig.h
     ${KDE4_INCLUDE_DIR}
     ${TAGLIB_INCLUDES}
-    ${TAGLIB-EXTRAS_INCLUDES}
     ${QT_INCLUDES}
     ${QT_QTSCRIPT_INCLUDE_DIR}
 )
 
+if ( TAGLIB-EXTRAS_FOUND )
+    include_directories( ${include_directories} ${TAGLIB-EXTRAS_INCLUDES} )
+endif ( TAGLIB-EXTRAS_FOUND )
+
 if ( KDEMULTIMEDIA_FOUND )
     include_directories( ${KDEMULTIMEDIA_INCLUDE_DIR} )
 endif ( KDEMULTIMEDIA_FOUND )
--- trunk/extragear/multimedia/amarok/utilities/collectionscanner/CMakeLists.txt #939128:939129
@@ -5,9 +5,13 @@
                      charset-detector/src/tables
                      ${QT_INCLUDES}
                      ${TAGLIB_INCLUDES}
-                     ${TAGLIB-EXTRAS_INCLUDES}
-                     ${CMAKE_CURRENT_BINARY_DIR})
+                     ${CMAKE_CURRENT_BINARY_DIR}
+                   )
 
+if ( TAGLIB-EXTRAS_FOUND )
+    include_directories( ${include_directories} ${TAGLIB-EXTRAS_INCLUDES} )
+endif ( TAGLIB-EXTRAS_FOUND )
+
 add_definitions(${TAGLIB_CFLAGS})
 
 #####################################################################
[prev in list] [next in list] [prev in thread] [next in thread]