From 13b769c326f2087c87cdb78ab2fae47ec17e4b18 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 30 May 2006 09:02:38 +0000 Subject: Move cmake duplicate check here: -> FindTagLib: need by kdemultimedia/amarok -> FindPostgreSQL: need by koffice-kexi/amarok -> FindMySQL: need by koffice-kexi/amarok -> FindMusicBrainz: need by amarok/kdemultimedia -> FindUSB: need by kdebase/amarok -> FindBerkeleyDB: need by kbabel/kdevelop -> FindRUBY: need by koffice-kross/amarok I will remove them from kde module after new snapshot (next monday) svn path=/trunk/KDE/kdelibs/; revision=546487 --- modules/FindMusicBrainz.cmake | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 modules/FindMusicBrainz.cmake (limited to 'modules/FindMusicBrainz.cmake') diff --git a/modules/FindMusicBrainz.cmake b/modules/FindMusicBrainz.cmake new file mode 100644 index 00000000..0ec56ffc --- /dev/null +++ b/modules/FindMusicBrainz.cmake @@ -0,0 +1,17 @@ +# Option for build or not MusicBrainz +# Laurent Montel 2006 + +FIND_PATH(MUSICBRAINZ_INCLUDE_DIR musicbrainz/musicbrainz.h + /usr/include + /usr/local/include + ) + +if(MUSICBRAINZ_INCLUDE_DIR) + set(MUSICBRAINZ_FOUND TRUE) + MESSAGE( STATUS "music brainz found in <${MUSICBRAINZ_INCLUDE_DIR}>") +else(MUSICBRAINZ_INCLUDE_DIR) + MESSAGE( STATUS "music brainz not found") +endif(MUSICBRAINZ_INCLUDE_DIR) + +MARK_AS_ADVANCED(MUSICBRAINZ_INCLUDE_DIR) + -- cgit v1.2.1 From c778596920e0d5357f216c885e35b4f97d371a23 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sat, 9 Sep 2006 10:18:35 +0000 Subject: added copyright notice everywhere. Now they all are BSD-licensed, as copyright holder I inserted everywhere the one who added it to svn (or Kitware if it is an enhanced copy from taken cmake) Some developers committed quite often but were not the ones who added the file, if you feel you have also copyright on the file add your name in the specific file. Copyright holders: CCMAIL: montel@kde.org CCMAIL: toscano.pino@tiscali.it CCMAIL: adymo@kdevelop.org CCMAIL: ranger@befunk.com CCMAIL: zack@kde.org CCMAIL: caslav.ilic@gmx.net CCMAIL: syntheticpp@yahoo.com CCMAIL: js@iidea.pl CCMAIL: michael.larouche@kdemail.net CCMAIL: ossi@kde.org CCMAIL: faure@kde.org Committers, but no files added so that they are not listed as copyright holders: CCMAIL: ch.ehrlicher@gmx.de CCMAIL: winter@kde.org CCMAIL: ralf.habacker@freenet.de CCMAIL: moura@kdewebdev.org CCMAIL: kde-buildsystem@kde.org Alex svn path=/trunk/KDE/kdelibs/; revision=582410 --- modules/FindMusicBrainz.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'modules/FindMusicBrainz.cmake') diff --git a/modules/FindMusicBrainz.cmake b/modules/FindMusicBrainz.cmake index 0ec56ffc..c4ccef80 100644 --- a/modules/FindMusicBrainz.cmake +++ b/modules/FindMusicBrainz.cmake @@ -1,5 +1,10 @@ # Option for build or not MusicBrainz -# Laurent Montel 2006 +# +# Copyright (c) 2006, Laurent Montel, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + FIND_PATH(MUSICBRAINZ_INCLUDE_DIR musicbrainz/musicbrainz.h /usr/include -- cgit v1.2.1 From 5d418dcdf5faf708d61790ef19e56f8c30aa1c97 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 14 Aug 2007 07:16:00 +0000 Subject: Other clean svn path=/trunk/KDE/kdelibs/; revision=699883 --- modules/FindMusicBrainz.cmake | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'modules/FindMusicBrainz.cmake') diff --git a/modules/FindMusicBrainz.cmake b/modules/FindMusicBrainz.cmake index c4ccef80..a30e2973 100644 --- a/modules/FindMusicBrainz.cmake +++ b/modules/FindMusicBrainz.cmake @@ -6,17 +6,10 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -FIND_PATH(MUSICBRAINZ_INCLUDE_DIR musicbrainz/musicbrainz.h - /usr/include - /usr/local/include - ) - -if(MUSICBRAINZ_INCLUDE_DIR) - set(MUSICBRAINZ_FOUND TRUE) - MESSAGE( STATUS "music brainz found in <${MUSICBRAINZ_INCLUDE_DIR}>") -else(MUSICBRAINZ_INCLUDE_DIR) - MESSAGE( STATUS "music brainz not found") -endif(MUSICBRAINZ_INCLUDE_DIR) +FIND_PATH(MUSICBRAINZ_INCLUDE_DIR musicbrainz/musicbrainz.h) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args( MusicBrainz DEFAULT_MSG + MUSICBRAINZ_INCLUDE_DIR) MARK_AS_ADVANCED(MUSICBRAINZ_INCLUDE_DIR) -- cgit v1.2.1 From b16050ff748c703ab53f1a81035f5b77f74e5fc6 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 5 Dec 2007 08:07:27 +0000 Subject: Search lib too svn path=/trunk/KDE/kdelibs/; revision=745044 --- modules/FindMusicBrainz.cmake | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'modules/FindMusicBrainz.cmake') diff --git a/modules/FindMusicBrainz.cmake b/modules/FindMusicBrainz.cmake index a30e2973..e2e0d30d 100644 --- a/modules/FindMusicBrainz.cmake +++ b/modules/FindMusicBrainz.cmake @@ -6,10 +6,19 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +if(MUSICBRAINZ_INCLUDE_DIR AND MUSICBRAINZ_LIBRARIES) + set(MUSICBRAINZ_FIND_QUIETLY TRUE) +endif(MUSICBRAINZ_INCLUDE_DIR AND MUSICBRAINZ_LIBRARIES) + FIND_PATH(MUSICBRAINZ_INCLUDE_DIR musicbrainz/musicbrainz.h) + +FIND_LIBRARY( MUSICBRAINZ_LIBRARIES NAMES musicbrainz) + + include(FindPackageHandleStandardArgs) find_package_handle_standard_args( MusicBrainz DEFAULT_MSG - MUSICBRAINZ_INCLUDE_DIR) + MUSICBRAINZ_INCLUDE_DIR MUSICBRAINZ_LIBRARIES) -MARK_AS_ADVANCED(MUSICBRAINZ_INCLUDE_DIR) +MARK_AS_ADVANCED(MUSICBRAINZ_INCLUDE_DIR MUSICBRAINZ_LIBRARIES) -- cgit v1.2.1 From 3b5694a0206762ed984345531e926dabb9ec87c8 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 5 Dec 2007 08:14:28 +0000 Subject: SVN_SILENT: update copyright svn path=/trunk/KDE/kdelibs/; revision=745048 --- modules/FindMusicBrainz.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindMusicBrainz.cmake') diff --git a/modules/FindMusicBrainz.cmake b/modules/FindMusicBrainz.cmake index e2e0d30d..09884115 100644 --- a/modules/FindMusicBrainz.cmake +++ b/modules/FindMusicBrainz.cmake @@ -1,6 +1,6 @@ # Option for build or not MusicBrainz # -# Copyright (c) 2006, Laurent Montel, +# Copyright (c) 2006,2007 Laurent Montel, # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -- cgit v1.2.1 From 814455b7ad321c88e730662fda58261087b72e72 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 18 Feb 2008 19:06:32 +0000 Subject: some improvements to the docs: -some modules were not at all documented, only few are left now -the copyright message doesn't have to be printed for every module in the docs -fix FindKorundom.cmake, it didn't follow the style guide and had typos (e.g. Korumdum_FOUND instead of KORUNDUM_FOUND) Alex (will commit modified FindKDE4Internal.cmake after Christians commit) svn path=/trunk/KDE/kdelibs/; revision=776742 --- modules/FindMusicBrainz.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'modules/FindMusicBrainz.cmake') diff --git a/modules/FindMusicBrainz.cmake b/modules/FindMusicBrainz.cmake index 09884115..9f2ad985 100644 --- a/modules/FindMusicBrainz.cmake +++ b/modules/FindMusicBrainz.cmake @@ -1,5 +1,10 @@ -# Option for build or not MusicBrainz +# Module to find the musicbrainz library # +# It defines +# MUSICBRAINZ_INCLUDE_DIR - the include dir +# MUSICBRAINZ_LIBRARIES - the required libraries +# MUSICBRAINZ_FOUND - true if both of the above have been found + # Copyright (c) 2006,2007 Laurent Montel, # # Redistribution and use is allowed according to the terms of the BSD license. -- cgit v1.2.1 From c38c295758f43bd8850b5ab36e28d91e870fa02c Mon Sep 17 00:00:00 2001 From: Xavier Vello Date: Tue, 4 Nov 2008 10:37:34 +0000 Subject: add a warning if only version 3 is found, as version 2 is needed svn path=/trunk/KDE/kdelibs/; revision=879904 --- modules/FindMusicBrainz.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'modules/FindMusicBrainz.cmake') diff --git a/modules/FindMusicBrainz.cmake b/modules/FindMusicBrainz.cmake index 9f2ad985..cc0c0e8f 100644 --- a/modules/FindMusicBrainz.cmake +++ b/modules/FindMusicBrainz.cmake @@ -10,8 +10,6 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. - - if(MUSICBRAINZ_INCLUDE_DIR AND MUSICBRAINZ_LIBRARIES) set(MUSICBRAINZ_FIND_QUIETLY TRUE) endif(MUSICBRAINZ_INCLUDE_DIR AND MUSICBRAINZ_LIBRARIES) @@ -20,6 +18,11 @@ FIND_PATH(MUSICBRAINZ_INCLUDE_DIR musicbrainz/musicbrainz.h) FIND_LIBRARY( MUSICBRAINZ_LIBRARIES NAMES musicbrainz) +# We need version 2, version 3 is source-incompatible +FIND_PATH(MUSICBRAINZ3_INCLUDE_DIR musicbrainz3/musicbrainz.h) +if(MUSICBRAINZ3_INCLUDE_DIR AND NOT MUSICBRAINZ_INCLUDE_DIR) + message(STATUS "\nIncompatible version 3 of the musicbrainz includes detected. Version 2 is needed.\n") +endif(MUSICBRAINZ3_INCLUDE_DIR AND NOT MUSICBRAINZ_INCLUDE_DIR) include(FindPackageHandleStandardArgs) find_package_handle_standard_args( MusicBrainz DEFAULT_MSG -- cgit v1.2.1 From aad79b808d22e0fe77e35214a7ed07fef79aef51 Mon Sep 17 00:00:00 2001 From: Xavier Vello Date: Tue, 4 Nov 2008 12:24:02 +0000 Subject: more explicit message svn path=/trunk/KDE/kdelibs/; revision=879947 --- modules/FindMusicBrainz.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindMusicBrainz.cmake') diff --git a/modules/FindMusicBrainz.cmake b/modules/FindMusicBrainz.cmake index cc0c0e8f..c93b2dcc 100644 --- a/modules/FindMusicBrainz.cmake +++ b/modules/FindMusicBrainz.cmake @@ -21,7 +21,7 @@ FIND_LIBRARY( MUSICBRAINZ_LIBRARIES NAMES musicbrainz) # We need version 2, version 3 is source-incompatible FIND_PATH(MUSICBRAINZ3_INCLUDE_DIR musicbrainz3/musicbrainz.h) if(MUSICBRAINZ3_INCLUDE_DIR AND NOT MUSICBRAINZ_INCLUDE_DIR) - message(STATUS "\nIncompatible version 3 of the musicbrainz includes detected. Version 2 is needed.\n") + message(STATUS "\nIncompatible version 3.x of the musicbrainz includes detected. Version 2.x is needed.\n") endif(MUSICBRAINZ3_INCLUDE_DIR AND NOT MUSICBRAINZ_INCLUDE_DIR) include(FindPackageHandleStandardArgs) -- cgit v1.2.1