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

List:       kde-commits
Subject:    [phonon/five] /: Add option to build demos. Only simpleplayer for now
From:       Casian Andrei <skeletk13 () gmail ! com>
Date:       2014-07-02 13:13:51
Message-ID: E1X2KMB-0003rz-Fg () scm ! kde ! org
[Download RAW message or body]

Git commit ca84672c2d5037ea1b65d7647c930636c353db7e by Casian Andrei.
Committed on 02/07/2014 at 11:15.
Pushed by casianandrei into branch 'five'.

Add option to build demos. Only simpleplayer for now

M  +5    -0    CMakeLists.txt
M  +3    -7    demos/CMakeLists.txt

http://commits.kde.org/phonon/ca84672c2d5037ea1b65d7647c930636c353db7e

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9367f24..fd8b407 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,6 +35,7 @@ ecm_setup_version("4.50.0"
 ################################### Options ##############################=
######
 =

 option(PHONON_BUILD_DECLARATIVE_PLUGIN "Build the Qt Declarative (QML) plu=
gin" OFF)
+option(PHONON_BUILD_DEMOS "Build the demo applications" OFF)
 option(PHONON_BUILD_DESIGNER_PLUGIN "Build the Qt Designer plugin" OFF)
 option(PHONON_BUILD_DOC "Build the API documentation" OFF)
 =

@@ -62,6 +63,10 @@ if(QT_QTDESIGNER_FOUND AND PHONON_BUILD_DESIGNER_PLUGIN)
     add_subdirectory(designer)
 endif(QT_QTDESIGNER_FOUND AND PHONON_BUILD_DESIGNER_PLUGIN)
 =

+if(PHONON_BUILD_DEMOS)
+    add_subdirectory(demos)
+endif(PHONON_BUILD_DEMOS)
+
 if(QT_QTDECLARATIVE_FOUND AND PHONON_BUILD_DECLARATIVE_PLUGIN)
     add_subdirectory(declarative)
 endif(QT_QTDECLARATIVE_FOUND AND PHONON_BUILD_DECLARATIVE_PLUGIN)
diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
index 4ef9e58..05a98a2 100644
--- a/demos/CMakeLists.txt
+++ b/demos/CMakeLists.txt
@@ -1,9 +1,5 @@
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_P=
ATH})
 =

-add_subdirectory(phota)
+#add_subdirectory(phota)
 add_subdirectory(simpleplayer)
-add_subdirectory(metadatareader)
-
-if (NOT PHONON_NO_CAPTURE)
-    add_subdirectory(simplecapture)
-endif (NOT PHONON_NO_CAPTURE)
+#add_subdirectory(metadatareader)
+#add_subdirectory(simplecapture)

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