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/FindTaglib.cmake | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 modules/FindTaglib.cmake (limited to 'modules/FindTaglib.cmake') diff --git a/modules/FindTaglib.cmake b/modules/FindTaglib.cmake new file mode 100644 index 00000000..7f258785 --- /dev/null +++ b/modules/FindTaglib.cmake @@ -0,0 +1,33 @@ +# - Try to find the Taglib library +# Once done this will define +# +# TAGLIB_FOUND - system has the taglib library +# TAGLIB_CFLAGS - the taglib cflags +# TAGLIB_LIBRARIES - The libraries needed to use taglib + + #KDE_CHECK_HEADER(taglib/mpcfile.h, have_taglib_mpc=yes, have_taglib_mpc=no) + +FIND_PROGRAM(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS + /usr/bin + /usr/local/bin +) + +#reset vars +set(TAGLIB_LIBRARIES) +set(TAGLIB_CFLAGS) + +# if taglib-config has been found +IF(TAGLIBCONFIG_EXECUTABLE) + + EXEC_PROGRAM(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) + + EXEC_PROGRAM(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS) + + IF(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) + SET(TAGLIB_FOUND TRUE) + message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}") + ENDIF(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) + + MARK_AS_ADVANCED(TAGLIB_CFLAGS TAGLIB_LIBRARIES) + +ENDIF(TAGLIBCONFIG_EXECUTABLE) -- 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/FindTaglib.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'modules/FindTaglib.cmake') diff --git a/modules/FindTaglib.cmake b/modules/FindTaglib.cmake index 7f258785..dc8bea36 100644 --- a/modules/FindTaglib.cmake +++ b/modules/FindTaglib.cmake @@ -4,8 +4,14 @@ # TAGLIB_FOUND - system has the taglib library # TAGLIB_CFLAGS - the taglib cflags # TAGLIB_LIBRARIES - The libraries needed to use taglib +# +# 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. + - #KDE_CHECK_HEADER(taglib/mpcfile.h, have_taglib_mpc=yes, have_taglib_mpc=no) +#KDE_CHECK_HEADER(taglib/mpcfile.h, have_taglib_mpc=yes, have_taglib_mpc=no) FIND_PROGRAM(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS /usr/bin -- cgit v1.2.1 From cf6bbc642ab6d6f4877183bcc715f8aa1da5ea30 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sun, 24 Sep 2006 13:15:25 +0000 Subject: This line is not necessary svn path=/trunk/KDE/kdelibs/; revision=587925 --- modules/FindTaglib.cmake | 2 -- 1 file changed, 2 deletions(-) (limited to 'modules/FindTaglib.cmake') diff --git a/modules/FindTaglib.cmake b/modules/FindTaglib.cmake index dc8bea36..2db6f79d 100644 --- a/modules/FindTaglib.cmake +++ b/modules/FindTaglib.cmake @@ -11,8 +11,6 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -#KDE_CHECK_HEADER(taglib/mpcfile.h, have_taglib_mpc=yes, have_taglib_mpc=no) - FIND_PROGRAM(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS /usr/bin /usr/local/bin -- cgit v1.2.1 From feb6ccac628ae9d88c4875703b6f34385a41b0c3 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 5 Apr 2007 09:47:02 +0000 Subject: Fix taglib cmake file svn path=/trunk/KDE/kdelibs/; revision=650717 --- modules/FindTaglib.cmake | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'modules/FindTaglib.cmake') diff --git a/modules/FindTaglib.cmake b/modules/FindTaglib.cmake index 2db6f79d..dea293cd 100644 --- a/modules/FindTaglib.cmake +++ b/modules/FindTaglib.cmake @@ -14,6 +14,7 @@ FIND_PROGRAM(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS /usr/bin /usr/local/bin + ${BIN_INSTALL_DIR} ) #reset vars @@ -35,3 +36,14 @@ IF(TAGLIBCONFIG_EXECUTABLE) MARK_AS_ADVANCED(TAGLIB_CFLAGS TAGLIB_LIBRARIES) ENDIF(TAGLIBCONFIG_EXECUTABLE) + +if(TAGLIB_FOUND) + IF(NOT Taglib_FIND_QUIETLY) + MESSAGE(STATUS "Taglib found: ${TAGLIB_LIBRARIES}") + ENDIF(NOT Taglib_FIND_QUIETLY) +ELSE(TAGLIB_FOUND) + IF(Taglib_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find Taglib") + ENDIF(Taglib_FIND_REQUIRED) +endif(TAGLIB_FOUND) + -- cgit v1.2.1 From 1eddbcbe310fbd69e387d79bf1faf2aef3626ef3 Mon Sep 17 00:00:00 2001 From: Patrick Spendrin Date: Tue, 18 Sep 2007 13:30:39 +0000 Subject: don't require tablib-config on windows svn path=/trunk/KDE/kdelibs/; revision=713994 --- modules/FindTaglib.cmake | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) (limited to 'modules/FindTaglib.cmake') diff --git a/modules/FindTaglib.cmake b/modules/FindTaglib.cmake index dea293cd..1602fe1d 100644 --- a/modules/FindTaglib.cmake +++ b/modules/FindTaglib.cmake @@ -10,13 +10,13 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -FIND_PROGRAM(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS - /usr/bin - /usr/local/bin - ${BIN_INSTALL_DIR} -) - +IF(NOT WIN32) + FIND_PROGRAM(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS + /usr/bin + /usr/local/bin + ${BIN_INSTALL_DIR} + ) +ENDIF(NOT WIN32) #reset vars set(TAGLIB_LIBRARIES) set(TAGLIB_CFLAGS) @@ -34,13 +34,34 @@ IF(TAGLIBCONFIG_EXECUTABLE) ENDIF(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) MARK_AS_ADVANCED(TAGLIB_CFLAGS TAGLIB_LIBRARIES) +ELSE(TAGLIBCONFIG_EXECUTABLE) + find_path(TAGLIB_INCLUDES + NAMES + tag.h + PATH_SUFFIXES taglib + PATHS + ${KDE4_INCLUDE_DIR} + ${INCLUDE_INSTALL_DIR} + ) + FIND_LIBRARY(TAGLIB_LIBRARIES + NAMES + tag + PATHS + ${KDE4_LIB_DIR} + ${LIB_INSTALL_DIR} + ) + + INCLUDE(FindPackageHandleStandardArgs) + find_package_handle_standard_args(Taglib DEFAULT_MSG + TAGLIB_INCLUDES TAGLIB_LIBRARIES) ENDIF(TAGLIBCONFIG_EXECUTABLE) + if(TAGLIB_FOUND) - IF(NOT Taglib_FIND_QUIETLY) + IF(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE) MESSAGE(STATUS "Taglib found: ${TAGLIB_LIBRARIES}") - ENDIF(NOT Taglib_FIND_QUIETLY) + ENDIF(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE) ELSE(TAGLIB_FOUND) IF(Taglib_FIND_REQUIRED) MESSAGE(FATAL_ERROR "Could not find Taglib") -- cgit v1.2.1 From 0e93aecc9d6e8736fa9b2bf0b9a8c6adc30e6337 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Mon, 24 Sep 2007 10:53:59 +0000 Subject: switch to new macro FIND_LIBRARY_EX() to avoid code duplication svn path=/trunk/KDE/kdelibs/; revision=716254 --- modules/FindTaglib.cmake | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'modules/FindTaglib.cmake') diff --git a/modules/FindTaglib.cmake b/modules/FindTaglib.cmake index 1602fe1d..7b5ffc39 100644 --- a/modules/FindTaglib.cmake +++ b/modules/FindTaglib.cmake @@ -10,6 +10,8 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. +include(FindLibraryEx) + IF(NOT WIN32) FIND_PROGRAM(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS /usr/bin @@ -44,12 +46,12 @@ ELSE(TAGLIBCONFIG_EXECUTABLE) ${INCLUDE_INSTALL_DIR} ) - FIND_LIBRARY(TAGLIB_LIBRARIES - NAMES - tag - PATHS - ${KDE4_LIB_DIR} - ${LIB_INSTALL_DIR} + FIND_LIBRARY_EX(TAGLIB_LIBRARIES + WIN32_DEBUG_POSTFIX d + NAMES tag + PATHS + ${KDE4_LIB_DIR} + ${LIB_INSTALL_DIR} ) INCLUDE(FindPackageHandleStandardArgs) -- cgit v1.2.1 From b94768531ef8881f2b6e7b93c4f0324f02b80487 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Sun, 30 Sep 2007 16:19:18 +0000 Subject: FIND_LIBRARY_EX -> FIND_LIBRARY_WITH_DEBUG svn path=/trunk/KDE/kdelibs/; revision=719224 --- modules/FindTaglib.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'modules/FindTaglib.cmake') diff --git a/modules/FindTaglib.cmake b/modules/FindTaglib.cmake index 7b5ffc39..a66ae57b 100644 --- a/modules/FindTaglib.cmake +++ b/modules/FindTaglib.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. -include(FindLibraryEx) - IF(NOT WIN32) FIND_PROGRAM(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS /usr/bin @@ -37,6 +35,9 @@ IF(TAGLIBCONFIG_EXECUTABLE) MARK_AS_ADVANCED(TAGLIB_CFLAGS TAGLIB_LIBRARIES) ELSE(TAGLIBCONFIG_EXECUTABLE) + include(FindLibraryWithDebug) + include(FindPackageHandleStandardArgs) + find_path(TAGLIB_INCLUDES NAMES tag.h @@ -46,7 +47,7 @@ ELSE(TAGLIBCONFIG_EXECUTABLE) ${INCLUDE_INSTALL_DIR} ) - FIND_LIBRARY_EX(TAGLIB_LIBRARIES + find_library_with_debug(TAGLIB_LIBRARIES WIN32_DEBUG_POSTFIX d NAMES tag PATHS @@ -54,7 +55,6 @@ ELSE(TAGLIBCONFIG_EXECUTABLE) ${LIB_INSTALL_DIR} ) - INCLUDE(FindPackageHandleStandardArgs) find_package_handle_standard_args(Taglib DEFAULT_MSG TAGLIB_INCLUDES TAGLIB_LIBRARIES) ENDIF(TAGLIBCONFIG_EXECUTABLE) -- cgit v1.2.1 From 430e3ca856e28e7bbda4d03dbe2037038c6e6cfa Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Thu, 4 Oct 2007 07:00:34 +0000 Subject: Remove not necessary path svn path=/trunk/KDE/kdelibs/; revision=720967 --- modules/FindTaglib.cmake | 2 -- 1 file changed, 2 deletions(-) (limited to 'modules/FindTaglib.cmake') diff --git a/modules/FindTaglib.cmake b/modules/FindTaglib.cmake index a66ae57b..225fa53d 100644 --- a/modules/FindTaglib.cmake +++ b/modules/FindTaglib.cmake @@ -12,8 +12,6 @@ IF(NOT WIN32) FIND_PROGRAM(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS - /usr/bin - /usr/local/bin ${BIN_INSTALL_DIR} ) ENDIF(NOT WIN32) -- 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/FindTaglib.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindTaglib.cmake') diff --git a/modules/FindTaglib.cmake b/modules/FindTaglib.cmake index 225fa53d..82306883 100644 --- a/modules/FindTaglib.cmake +++ b/modules/FindTaglib.cmake @@ -4,7 +4,7 @@ # TAGLIB_FOUND - system has the taglib library # TAGLIB_CFLAGS - the taglib cflags # TAGLIB_LIBRARIES - The libraries needed to use taglib -# + # Copyright (c) 2006, Laurent Montel, # # Redistribution and use is allowed according to the terms of the BSD license. -- cgit v1.2.1 From 592547dc5c0febfd93c30a1aabdcd7057a27dd28 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 21 Mar 2008 15:19:06 +0000 Subject: Add TAGLIB_MIN_VERSION svn path=/trunk/KDE/kdelibs/; revision=788446 --- modules/FindTaglib.cmake | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'modules/FindTaglib.cmake') diff --git a/modules/FindTaglib.cmake b/modules/FindTaglib.cmake index 82306883..35fd6b03 100644 --- a/modules/FindTaglib.cmake +++ b/modules/FindTaglib.cmake @@ -10,6 +10,10 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. +if(NOT TAGLIB_MIN_VERSION) + set(TAGLIB_MIN_VERSION "1.4") +endif(NOT TAGLIB_MIN_VERSION) + IF(NOT WIN32) FIND_PROGRAM(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS ${BIN_INSTALL_DIR} @@ -22,15 +26,23 @@ set(TAGLIB_CFLAGS) # if taglib-config has been found IF(TAGLIBCONFIG_EXECUTABLE) - EXEC_PROGRAM(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) + EXEC_PROGRAM(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION) + + if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") + MESSAGE(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}") + SET(TAGLIB_FOUND FALSE) + else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") + + EXEC_PROGRAM(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) - EXEC_PROGRAM(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS) + EXEC_PROGRAM(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS) - IF(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) - SET(TAGLIB_FOUND TRUE) - message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}") - ENDIF(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) + IF(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) + SET(TAGLIB_FOUND TRUE) + message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}") + ENDIF(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) + endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") MARK_AS_ADVANCED(TAGLIB_CFLAGS TAGLIB_LIBRARIES) ELSE(TAGLIBCONFIG_EXECUTABLE) include(FindLibraryWithDebug) -- cgit v1.2.1 From e30c2c3ff44d43c179c891fe94d1e2fe9f5b7873 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 20 Jul 2008 09:26:40 +0000 Subject: -remove empty lines from documentation block in FindQt4.cmake, so everything is included again in the generated documentatiom -lowercase FindTaglib.cmake Alex svn path=/trunk/KDE/kdelibs/; revision=835221 --- modules/FindTaglib.cmake | 49 +++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) (limited to 'modules/FindTaglib.cmake') diff --git a/modules/FindTaglib.cmake b/modules/FindTaglib.cmake index 35fd6b03..3edfdb4a 100644 --- a/modules/FindTaglib.cmake +++ b/modules/FindTaglib.cmake @@ -14,37 +14,40 @@ if(NOT TAGLIB_MIN_VERSION) set(TAGLIB_MIN_VERSION "1.4") endif(NOT TAGLIB_MIN_VERSION) -IF(NOT WIN32) - FIND_PROGRAM(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS +if(NOT WIN32) + find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS ${BIN_INSTALL_DIR} ) -ENDIF(NOT WIN32) +endif(NOT WIN32) + #reset vars set(TAGLIB_LIBRARIES) set(TAGLIB_CFLAGS) # if taglib-config has been found -IF(TAGLIBCONFIG_EXECUTABLE) +if(TAGLIBCONFIG_EXECUTABLE) - EXEC_PROGRAM(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION) + exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION) if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") - MESSAGE(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}") - SET(TAGLIB_FOUND FALSE) + message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}") + set(TAGLIB_FOUND FALSE) else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") - EXEC_PROGRAM(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) + exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) - EXEC_PROGRAM(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS) + exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS) - IF(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) - SET(TAGLIB_FOUND TRUE) + if(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) + set(TAGLIB_FOUND TRUE) message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}") - ENDIF(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) + endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) + + endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") + mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES) + +else(TAGLIBCONFIG_EXECUTABLE) - endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") - MARK_AS_ADVANCED(TAGLIB_CFLAGS TAGLIB_LIBRARIES) -ELSE(TAGLIBCONFIG_EXECUTABLE) include(FindLibraryWithDebug) include(FindPackageHandleStandardArgs) @@ -67,16 +70,16 @@ ELSE(TAGLIBCONFIG_EXECUTABLE) find_package_handle_standard_args(Taglib DEFAULT_MSG TAGLIB_INCLUDES TAGLIB_LIBRARIES) -ENDIF(TAGLIBCONFIG_EXECUTABLE) +endif(TAGLIBCONFIG_EXECUTABLE) if(TAGLIB_FOUND) - IF(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE) - MESSAGE(STATUS "Taglib found: ${TAGLIB_LIBRARIES}") - ENDIF(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE) -ELSE(TAGLIB_FOUND) - IF(Taglib_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find Taglib") - ENDIF(Taglib_FIND_REQUIRED) + if(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE) + message(STATUS "Taglib found: ${TAGLIB_LIBRARIES}") + endif(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE) +else(TAGLIB_FOUND) + if(Taglib_FIND_REQUIRED) + message(FATAL_ERROR "Could not find Taglib") + endif(Taglib_FIND_REQUIRED) endif(TAGLIB_FOUND) -- cgit v1.2.1 From 4e0138ca6cd56722c140c22c31b838d420173744 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 21 Jul 2008 11:09:49 +0000 Subject: Be sure that we defined TAGLIB_INCLUDES svn path=/trunk/KDE/kdelibs/; revision=835837 --- modules/FindTaglib.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'modules/FindTaglib.cmake') diff --git a/modules/FindTaglib.cmake b/modules/FindTaglib.cmake index 3edfdb4a..ad1e1010 100644 --- a/modules/FindTaglib.cmake +++ b/modules/FindTaglib.cmake @@ -42,9 +42,10 @@ if(TAGLIBCONFIG_EXECUTABLE) set(TAGLIB_FOUND TRUE) message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}") endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) - + string(REGEX REPLACE " *-I" ";" TAGLIB_CFLAGS "${TAGLIB_CFLAGS}") + set(TAGLIB_INCLUDES ${TAGLIB_CFLAGS}) endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") - mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES) + mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES) else(TAGLIBCONFIG_EXECUTABLE) -- cgit v1.2.1 From 8d9efc2b285ef9f5dff75958a659eb20bb239d69 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 21 Jul 2008 20:23:58 +0000 Subject: Better to not change TAGLIB_CFLAGS svn path=/trunk/KDE/kdelibs/; revision=836159 --- modules/FindTaglib.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'modules/FindTaglib.cmake') diff --git a/modules/FindTaglib.cmake b/modules/FindTaglib.cmake index ad1e1010..5bbb8ee1 100644 --- a/modules/FindTaglib.cmake +++ b/modules/FindTaglib.cmake @@ -42,8 +42,7 @@ if(TAGLIBCONFIG_EXECUTABLE) set(TAGLIB_FOUND TRUE) message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}") endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) - string(REGEX REPLACE " *-I" ";" TAGLIB_CFLAGS "${TAGLIB_CFLAGS}") - set(TAGLIB_INCLUDES ${TAGLIB_CFLAGS}) + string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}") endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES) -- cgit v1.2.1