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

List:       kde-commits
Subject:    [phonon-vlc] cmake/modules: (only) include internals when phonon_add_executable macro is not present
From:       Harald Sitter <sitter () kde ! org>
Date:       2013-01-31 23:40:11
Message-ID: 20130131234011.B7178A6091 () git ! kde ! org
[Download RAW message or body]

Git commit 452317b613541b76994b941e35da64590b6358d7 by Harald Sitter.
Committed on 01/02/2013 at 00:36.
Pushed by sitter into branch 'master'.

(only) include internals when phonon_add_executable macro is not present

this increases compatibility between phonon <4.7 and >=4.7. for <4.7 the
internals will not be included (as they are already present), and for
>=4.7 they will be included.

note that this also prevents general double-inclusion, which is why it uses
the macro check over a version check. for phonon5 we should find a better
solution though.

M  +6    -2    cmake/modules/FindPhonon.cmake

http://commits.kde.org/phonon-vlc/452317b613541b76994b941e35da64590b6358d7

diff --git a/cmake/modules/FindPhonon.cmake b/cmake/modules/FindPhonon.cmake
index b05a4bb..db07646 100644
--- a/cmake/modules/FindPhonon.cmake
+++ b/cmake/modules/FindPhonon.cmake
@@ -1,6 +1,6 @@
 # Find Phonon
 
-# Copyright (c) 2010, Harald Sitter <sitter@kde.org>
+# Copyright (c) 2010-2013, Harald Sitter <sitter@kde.org>
 # Copyright (c) 2011, Alexander Neundorf <neundorf@kde.org>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
@@ -10,7 +10,11 @@ find_package(Phonon NO_MODULE)
 
 if(PHONON_BUILDSYSTEM_DIR)
     set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PHONON_BUILDSYSTEM_DIR})
-    include(${PHONON_BUILDSYSTEM_DIR}/FindPhononInternal.cmake )
+    # Prevent double-include of internals, and make sure they are included
+    # In Phonon <4.7 the internals were auto-included, in >=4.7 they are not.
+    if(NOT COMMAND phonon_add_executable)
+        include(${PHONON_BUILDSYSTEM_DIR}/FindPhononInternal.cmake )
+    endif()
 endif()
 
 include(FindPackageHandleStandardArgs)
[prev in list] [next in list] [prev in thread] [next in thread]