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

List:       kde-commits
Subject:    KDE/kdebase/runtime/phonon
From:       Alexander Neundorf <neundorf () kde ! org>
Date:       2010-03-12 18:26:11
Message-ID: 1268418371.377346.27149.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1102513 by neundorf:

-rename the option KDE4_DISABLE_MULTIMEDIA to KDEBASE_DISABLE_MULTIMEDIA, since this \
is only a kdebase-specific setting, and not a general KDE-wide switch (and it comes \
                from kdebase)
-consistent lowercasing
-remove unused include(usePkgConfig)

Alex



 M  +15 -10    CMakeLists.txt  


--- trunk/KDE/kdebase/runtime/phonon/CMakeLists.txt #1102512:1102513
@@ -1,20 +1,25 @@
-# If you want to build KDE without any multimedia support
-# define the cmake variable KDE4_DISABLE_MULTIMEDIA, i.e,
-# % cmake -DKDE4_DISABLE_MULTIMEDIA=ON
+# If you want to build kdebase without any multimedia support
+# define the cmake variable KDEBASE_DISABLE_MULTIMEDIA, i.e,
+# % cmake -DKDEBASE_DISABLE_MULTIMEDIA=ON
 #
 
-include(UsePkgConfig)
-OPTION(KDE4_DISABLE_MULTIMEDIA "Disable multimedia support (default: off)" OFF)
+option(KDEBASE_DISABLE_MULTIMEDIA "Disable multimedia support (default: off)" OFF)
 
+# print a message for backward compatibility:
 if(KDE4_DISABLE_MULTIMEDIA)
-   message(STATUS "NOTICE: Multimedia support DISABLED (KDE4_DISABLE_MULTIMEDIA == \
                ON)")
-else(KDE4_DISABLE_MULTIMEDIA)
+   message(STATUS "*********** The switch KDE4_DISABLE_MULTIMEDIA is not supported \
anymore, use KDEBASE_DISABLE_MULTIMEDIA instead ************") \
+endif(KDE4_DISABLE_MULTIMEDIA) +
+
+if(KDEBASE_DISABLE_MULTIMEDIA)
+   message(STATUS "NOTICE: Multimedia support DISABLED (KDEBASE_DISABLE_MULTIMEDIA \
== ON)") +else(KDEBASE_DISABLE_MULTIMEDIA)
    set(PHONON_MIN_VERSION "4.2.96")
    macro_ensure_version("${PHONON_MIN_VERSION}" "${PHONON_VERSION}" \
_phonon_version_ok)  macro_log_feature(_phonon_version_ok "Phonon" "Phonon library" \
"svn.kde.org/home/kde/trunk/kdesupport/phonon" TRUE "${PHONON_MIN_VERSION}" "STRONGLY \
RECOMMENDED: Required for playing audio and video throughout KDE")  
-   FIND_PACKAGE(Alsa)
-   ALSA_CONFIGURE_FILE(${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h)
+   find_package(Alsa)
+   alsa_configure_file(${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h)
 
    if(NOT ALSA_FOUND)
       set(ALSA_INCLUDES "")
@@ -25,4 +30,4 @@
    add_subdirectory(platform_kde)
    add_subdirectory(tests)
    add_subdirectory(kcm)
-endif(KDE4_DISABLE_MULTIMEDIA)
+endif(KDEBASE_DISABLE_MULTIMEDIA)


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