From 8b495e1dd1299767a3515cde7c6474a76bc5c8ec Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Wed, 18 Nov 2009 14:43:23 +0000 Subject: rename FindAttica to FindLibAttica as suggested by Alex svn path=/trunk/KDE/kdelibs/; revision=1050996 --- modules/FindLibAttica.cmake | 47 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 modules/FindLibAttica.cmake (limited to 'modules/FindLibAttica.cmake') diff --git a/modules/FindLibAttica.cmake b/modules/FindLibAttica.cmake new file mode 100644 index 00000000..39ae84d4 --- /dev/null +++ b/modules/FindLibAttica.cmake @@ -0,0 +1,47 @@ +# Try to find the Attica library +# Once done this will define +# +# LIBATTICA_FOUND Indicates that Attica was found +# LIBATTICA_LIBRARIES Libraries needed to use Attica +# LIBATTICA_LIBRARY_DIRS Paths needed for linking against Attica +# LIBATTICA_INCLUDE_DIRS Paths needed for finding Attica include files +# +# Copyright (c) 2009 Frederik Gladhorn +# +# Redistribution and use is allowed according to the terms of the BSD license. + +IF (LIBATTICA_INCLUDE_DIR AND LIBATTICA_LIBRARIES) + # in cache already + SET(libattica_FIND_QUIETLY TRUE) +ENDIF (LIBATTICA_INCLUDE_DIR AND LIBATTICA_LIBRARIES) + +IF (NOT WIN32) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + FIND_PACKAGE(PkgConfig) + PKG_CHECK_MODULES(PC_LIBATTICA QUIET libattica-0.1) + SET(LIBATTICA_DEFINITIONS ${PC_ATTICA_CFLAGS_OTHER}) +ENDIF (NOT WIN32) + +FIND_PATH(LIBATTICA_INCLUDE_DIR attica/provider.h + HINTS + ${PC_LIBATTICA_INCLUDEDIR} + ${PC_LIBATTICA_INCLUDE_DIRS} + PATH_SUFFIXES attica + ) + +FIND_LIBRARY(LIBATTICA_LIBRARIES NAMES attica libattica + HINTS + ${PC_LIBATTICA_LIBDIR} + ${PC_LIBATTICA_LIBRARY_DIRS} + ) + +INCLUDE(FindPackageHandleStandardArgs) + +# handle the QUIETLY and REQUIRED arguments and set ATTICA_FOUND to TRUE if +# all listed variables are TRUE +FIND_PACKAGE_HANDLE_STANDARD_ARGS(libattica DEFAULT_MSG LIBATTICA_LIBRARIES LIBATTICA_INCLUDE_DIR) + +MARK_AS_ADVANCED(LIBATTICA_INCLUDE_DIR LIBATTICA_LIBRARIES) + + -- cgit v1.2.1 From 985f0374dfe89dcff0e58c5e76a1ae6710ee1c18 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Tue, 8 Dec 2009 10:46:16 +0000 Subject: add version check for attica svn path=/trunk/KDE/kdelibs/; revision=1060235 --- modules/FindLibAttica.cmake | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) (limited to 'modules/FindLibAttica.cmake') diff --git a/modules/FindLibAttica.cmake b/modules/FindLibAttica.cmake index 39ae84d4..151a3bfb 100644 --- a/modules/FindLibAttica.cmake +++ b/modules/FindLibAttica.cmake @@ -10,6 +10,10 @@ # # Redistribution and use is allowed according to the terms of the BSD license. +IF (NOT LIBATTICA_MIN_VERSION) + SET(LIBATTICA_MIN_VERSION "0.1.0") +ENDIF(NOT LIBATTICA_MIN_VERSION) + IF (LIBATTICA_INCLUDE_DIR AND LIBATTICA_LIBRARIES) # in cache already SET(libattica_FIND_QUIETLY TRUE) @@ -30,6 +34,24 @@ FIND_PATH(LIBATTICA_INCLUDE_DIR attica/provider.h PATH_SUFFIXES attica ) +SET(LIBATTICA_VERSION_OK TRUE) +IF(LIBATTICA_INCLUDE_DIR) + FILE(READ ${LIBATTICA_INCLUDE_DIR}/attica/version.h LIBATTICA_VERSION_CONTENT) + STRING (REGEX MATCH "LIBATTICA_VERSION_STRING \".*\"\n" LIBATTICA_VERSION_MATCH "${LIBATTICA_VERSION_CONTENT}") + IF(LIBATTICA_VERSION_MATCH) + STRING(REGEX REPLACE "LIBATTICA_VERSION_STRING \"(.*)\"\n" "\\1" LIBATTICA_VERSION ${LIBATTICA_VERSION_MATCH}) + IF(LIBATTICA_VERSION STRLESS "${LIBATTICA_MIN_VERSION}") + SET(LIBATTICA_VERSION_OK FALSE) + IF(LibAttica_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "LibAttica version ${LIBATTICA_VERSION} is too old. Please install ${LIBATTICA_MIN_VERSION} or newer.") + ELSE(LibAttica_FIND_REQUIRED) + MESSAGE(STATUS "LibAttica version ${LIBATTICA_VERSION} is too old. Please install ${LIBATTICA_MIN_VERSION} or newer.") + ENDIF(LibAttica_FIND_REQUIRED) + ENDIF(LIBATTICA_VERSION STRLESS "${LIBATTICA_MIN_VERSION}") + ENDIF(LIBATTICA_VERSION_MATCH) +ENDIF(LIBATTICA_INCLUDE_DIR) + + FIND_LIBRARY(LIBATTICA_LIBRARIES NAMES attica libattica HINTS ${PC_LIBATTICA_LIBDIR} @@ -37,10 +59,9 @@ FIND_LIBRARY(LIBATTICA_LIBRARIES NAMES attica libattica ) INCLUDE(FindPackageHandleStandardArgs) - # handle the QUIETLY and REQUIRED arguments and set ATTICA_FOUND to TRUE if # all listed variables are TRUE -FIND_PACKAGE_HANDLE_STANDARD_ARGS(libattica DEFAULT_MSG LIBATTICA_LIBRARIES LIBATTICA_INCLUDE_DIR) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(libattica DEFAULT_MSG LIBATTICA_LIBRARIES LIBATTICA_INCLUDE_DIR LIBATTICA_VERSION_OK) MARK_AS_ADVANCED(LIBATTICA_INCLUDE_DIR LIBATTICA_LIBRARIES) -- cgit v1.2.1 From 7b67acd33ea47c03c4d649cde44c9c481f361f59 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sun, 13 Dec 2009 16:31:31 +0000 Subject: SVN_SILENT Fix doc. LIBATTICA_INCLUDE_DIRS doesn't exist. svn path=/trunk/KDE/kdelibs/; revision=1062043 --- modules/FindLibAttica.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindLibAttica.cmake') diff --git a/modules/FindLibAttica.cmake b/modules/FindLibAttica.cmake index 151a3bfb..f901075a 100644 --- a/modules/FindLibAttica.cmake +++ b/modules/FindLibAttica.cmake @@ -4,7 +4,7 @@ # LIBATTICA_FOUND Indicates that Attica was found # LIBATTICA_LIBRARIES Libraries needed to use Attica # LIBATTICA_LIBRARY_DIRS Paths needed for linking against Attica -# LIBATTICA_INCLUDE_DIRS Paths needed for finding Attica include files +# LIBATTICA_INCLUDE_DIR Path needed for finding Attica include files # # Copyright (c) 2009 Frederik Gladhorn # -- cgit v1.2.1 From 028b0d21b6bcdad6ae71bb35748261af900d492c Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Wed, 6 Jan 2010 22:17:39 +0000 Subject: -setting QUIETLY manually is not necessary, this is handled automatically by find_package_handle_standard_args() -the first argument to find_package_handle_standard_args() should be the exact-case name of the Find-module, i.e. "LibAttica", not "libattica" Frederik: if you really want to see this as "libattica", then the module has to be renamed to "Findlibattica.cmake", which is also ok and we still have the time to do it since this file has not been part of a release yet. Alex CCMAIL: CCMAIL: svn path=/trunk/KDE/kdelibs/; revision=1070847 --- modules/FindLibAttica.cmake | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'modules/FindLibAttica.cmake') diff --git a/modules/FindLibAttica.cmake b/modules/FindLibAttica.cmake index f901075a..b9b0610a 100644 --- a/modules/FindLibAttica.cmake +++ b/modules/FindLibAttica.cmake @@ -14,11 +14,6 @@ IF (NOT LIBATTICA_MIN_VERSION) SET(LIBATTICA_MIN_VERSION "0.1.0") ENDIF(NOT LIBATTICA_MIN_VERSION) -IF (LIBATTICA_INCLUDE_DIR AND LIBATTICA_LIBRARIES) - # in cache already - SET(libattica_FIND_QUIETLY TRUE) -ENDIF (LIBATTICA_INCLUDE_DIR AND LIBATTICA_LIBRARIES) - IF (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls @@ -59,10 +54,9 @@ FIND_LIBRARY(LIBATTICA_LIBRARIES NAMES attica libattica ) INCLUDE(FindPackageHandleStandardArgs) -# handle the QUIETLY and REQUIRED arguments and set ATTICA_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set LIBATTICA_FOUND to TRUE if # all listed variables are TRUE -FIND_PACKAGE_HANDLE_STANDARD_ARGS(libattica DEFAULT_MSG LIBATTICA_LIBRARIES LIBATTICA_INCLUDE_DIR LIBATTICA_VERSION_OK) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibAttica DEFAULT_MSG LIBATTICA_LIBRARIES LIBATTICA_INCLUDE_DIR LIBATTICA_VERSION_OK) MARK_AS_ADVANCED(LIBATTICA_INCLUDE_DIR LIBATTICA_LIBRARIES) - -- cgit v1.2.1 From 44c4e967802b0f4f5b918fa247c3b62dd9f803eb Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" Date: Fri, 9 Apr 2010 18:32:46 +0000 Subject: fixed: the pkg-config name is libattica svn path=/trunk/KDE/kdelibs/; revision=1113028 --- modules/FindLibAttica.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindLibAttica.cmake') diff --git a/modules/FindLibAttica.cmake b/modules/FindLibAttica.cmake index b9b0610a..f7652fba 100644 --- a/modules/FindLibAttica.cmake +++ b/modules/FindLibAttica.cmake @@ -18,7 +18,7 @@ IF (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls FIND_PACKAGE(PkgConfig) - PKG_CHECK_MODULES(PC_LIBATTICA QUIET libattica-0.1) + PKG_CHECK_MODULES(PC_LIBATTICA QUIET libattica) SET(LIBATTICA_DEFINITIONS ${PC_ATTICA_CFLAGS_OTHER}) ENDIF (NOT WIN32) -- cgit v1.2.1 From 1da2a6ee84e65dfb9fd5960968e9b8b91808cf3f Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 26 Sep 2010 10:00:19 +0000 Subject: -improve version checking for LibAttica - use the new FPHSA() mode - store the found version in the cache Alex svn path=/trunk/KDE/kdelibs/; revision=1179861 --- modules/FindLibAttica.cmake | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) (limited to 'modules/FindLibAttica.cmake') diff --git a/modules/FindLibAttica.cmake b/modules/FindLibAttica.cmake index f7652fba..bb919da7 100644 --- a/modules/FindLibAttica.cmake +++ b/modules/FindLibAttica.cmake @@ -6,13 +6,23 @@ # LIBATTICA_LIBRARY_DIRS Paths needed for linking against Attica # LIBATTICA_INCLUDE_DIR Path needed for finding Attica include files # +# The minimum required version of LibAttica can be specified using the +# standard syntax, e.g. find_package(LibAttica 0.20) + # Copyright (c) 2009 Frederik Gladhorn # # Redistribution and use is allowed according to the terms of the BSD license. -IF (NOT LIBATTICA_MIN_VERSION) - SET(LIBATTICA_MIN_VERSION "0.1.0") -ENDIF(NOT LIBATTICA_MIN_VERSION) +# Support LIBATTICA_MIN_VERSION for compatibility: +IF(NOT LibAttica_FIND_VERSION) + SET(LibAttica_FIND_VERSION "${LIBATTICA_MIN_VERSION}") +ENDIF(NOT LibAttica_FIND_VERSION) + +# the minimum version of LibAttica we require +IF(NOT LibAttica_FIND_VERSION) + SET(LibAttica_FIND_VERSION "0.1.0") +ENDIF(NOT LibAttica_FIND_VERSION) + IF (NOT WIN32) # use pkg-config to get the directories and then use these values @@ -29,22 +39,15 @@ FIND_PATH(LIBATTICA_INCLUDE_DIR attica/provider.h PATH_SUFFIXES attica ) -SET(LIBATTICA_VERSION_OK TRUE) -IF(LIBATTICA_INCLUDE_DIR) +# Store the version number in the cache, so we don't have to search everytime: +IF(LIBATTICA_INCLUDE_DIR AND NOT LIBATTICA_VERSION) FILE(READ ${LIBATTICA_INCLUDE_DIR}/attica/version.h LIBATTICA_VERSION_CONTENT) STRING (REGEX MATCH "LIBATTICA_VERSION_STRING \".*\"\n" LIBATTICA_VERSION_MATCH "${LIBATTICA_VERSION_CONTENT}") IF(LIBATTICA_VERSION_MATCH) - STRING(REGEX REPLACE "LIBATTICA_VERSION_STRING \"(.*)\"\n" "\\1" LIBATTICA_VERSION ${LIBATTICA_VERSION_MATCH}) - IF(LIBATTICA_VERSION STRLESS "${LIBATTICA_MIN_VERSION}") - SET(LIBATTICA_VERSION_OK FALSE) - IF(LibAttica_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "LibAttica version ${LIBATTICA_VERSION} is too old. Please install ${LIBATTICA_MIN_VERSION} or newer.") - ELSE(LibAttica_FIND_REQUIRED) - MESSAGE(STATUS "LibAttica version ${LIBATTICA_VERSION} is too old. Please install ${LIBATTICA_MIN_VERSION} or newer.") - ENDIF(LibAttica_FIND_REQUIRED) - ENDIF(LIBATTICA_VERSION STRLESS "${LIBATTICA_MIN_VERSION}") + STRING(REGEX REPLACE "LIBATTICA_VERSION_STRING \"(.*)\"\n" "\\1" _LIBATTICA_VERSION ${LIBATTICA_VERSION_MATCH}) ENDIF(LIBATTICA_VERSION_MATCH) -ENDIF(LIBATTICA_INCLUDE_DIR) + SET(LIBATTICA_VERSION "${_LIBATTICA_VERSION}" CACHE STRING "Version number of LibAttica" FORCE) +ENDIF(LIBATTICA_INCLUDE_DIR AND NOT LIBATTICA_VERSION) FIND_LIBRARY(LIBATTICA_LIBRARIES NAMES attica libattica @@ -54,9 +57,7 @@ FIND_LIBRARY(LIBATTICA_LIBRARIES NAMES attica libattica ) INCLUDE(FindPackageHandleStandardArgs) -# handle the QUIETLY and REQUIRED arguments and set LIBATTICA_FOUND to TRUE if -# all listed variables are TRUE -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibAttica DEFAULT_MSG LIBATTICA_LIBRARIES LIBATTICA_INCLUDE_DIR LIBATTICA_VERSION_OK) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibAttica REQUIRED_VARS LIBATTICA_LIBRARIES LIBATTICA_INCLUDE_DIR + VERSION_VAR LIBATTICA_VERSION) MARK_AS_ADVANCED(LIBATTICA_INCLUDE_DIR LIBATTICA_LIBRARIES) - -- cgit v1.2.1