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

List:       kde-commits
Subject:    [amarok] /: Make building spectrum analyzer applet optional
From:       Sam Lade <sam () sentynel ! com>
Date:       2012-05-31 20:20:08
Message-ID: 20120531202008.41C1DA60BB () git ! kde ! org
[Download RAW message or body]

Git commit 98022d75d345f8799144b07c07eeb1329385a010 by Sam Lade.
Committed on 31/05/2012 at 22:17.
Pushed by lade into branch 'master'.

Make building spectrum analyzer applet optional

Adds -DWITH_SPECTRUM_ANALYZER option to cmake and marks OpenGL as an
optional package.

M  +6    -3    CMakeLists.txt
M  +5    -0    ChangeLog
M  +1    -1    src/context/applets/CMakeLists.txt
M  +1    -1    src/context/engines/CMakeLists.txt

http://commits.kde.org/amarok/98022d75d345f8799144b07c07eeb1329385a010

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed51401..0d146c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,7 @@ 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_IPOD "Enable iPod support in Amarok" ON)
 option(WITH_MYSQL_EMBEDDED "Build the embedded database library -- highly \
recommended" ON) +option(WITH_SPECTRUM_ANALYZER "Enable the spectrum analyzer context \
applet in Amarok" ON)  option(WITH_PLAYGROUND "Enable building of playground scripts \
and applets (WARNING: some of them might have legal issues!)" OFF)  
 include(CheckLibraryExists)
@@ -114,9 +115,11 @@ if( WITH_PLAYER )
     find_package(QCA2)
     macro_log_feature( QCA2_FOUND "qca2" "Qt Cryptographic Architecture" \
"http://delta.affinix.com/qca/" FALSE "" "" )  
-    # OpenGL is required for the spectrum analyzer
-    find_package(OpenGL)
-    macro_log_feature( OPENGL_FOUND "OpenGL" "Support for hardware acceleration \
(enables the Spectrum Analyzer)" FALSE "" "" ) +    if( WITH_SPECTRUM_ANALYZER )
+        # OpenGL is required for the spectrum analyzer
+        macro_optional_find_package(OpenGL)
+        macro_log_feature( OPENGL_FOUND "OpenGL" "Support for hardware acceleration \
(enables the Spectrum Analyzer)" "http://www.opengl.org/" FALSE "" "" ) +    endif( \
WITH_SPECTRUM_ANALYZER )  
     # QJson is required for the PlaydarCollection
     macro_optional_find_package(QJSON)
diff --git a/ChangeLog b/ChangeLog
index 4f01ae6..5cd6c32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@ Amarok ChangeLog
 ================
 (C) 2002-2012 the Amarok authors.
 
+VERSION 2.6
+  CHANGES:
+    * Building the spectrum analyzer applet can now be disabled with a CMake
+      argument.
+
 VERSION 2.6-Beta 1
   FEATURES:
     * Amazon store: improved album search
diff --git a/src/context/applets/CMakeLists.txt b/src/context/applets/CMakeLists.txt
index 3b40c20..8c4a73f 100644
--- a/src/context/applets/CMakeLists.txt
+++ b/src/context/applets/CMakeLists.txt
@@ -7,7 +7,7 @@ add_subdirectory( photos )
 add_subdirectory( labels )
 add_subdirectory( tabs )
 
-if( OPENGL_FOUND )
+if( WITH_SPECTRUM_ANALYZER AND OPENGL_FOUND )
     add_subdirectory( spectrumanalyzer )
 endif()
 
diff --git a/src/context/engines/CMakeLists.txt b/src/context/engines/CMakeLists.txt
index da9809e..08d57e9 100644
--- a/src/context/engines/CMakeLists.txt
+++ b/src/context/engines/CMakeLists.txt
@@ -6,7 +6,7 @@ add_subdirectory( photos )
 add_subdirectory( labels )
 add_subdirectory( tabs )
 
-if( OPENGL_FOUND )
+if( WITH_SPECTRUM_ANALYZER AND OPENGL_FOUND )
     add_subdirectory( spectrumanalyzer )
 endif()
 


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