diff options
| author | David Faure <faure@kde.org> | 2007-05-02 10:00:52 +0000 | 
|---|---|---|
| committer | David Faure <faure@kde.org> | 2007-05-02 10:00:52 +0000 | 
| commit | e37ad7959568a3a7fa19fe874f423ea10488b5d1 (patch) | |
| tree | 0b8c6ff3c70c8ce6216a199353d86f82d8bd0fd7 | |
| parent | 00185b5c6e86ccb4ba7001cba455f54f29119d17 (diff) | |
| download | extra-cmake-modules-e37ad7959568a3a7fa19fe874f423ea10488b5d1.tar.gz extra-cmake-modules-e37ad7959568a3a7fa19fe874f423ea10488b5d1.tar.bz2 | |
Revert - it's not always compiled.
-> it's not a standard KDE4_FOO_LIBS, it's a KMETADATA_LIBRARIES like any 3rd-party lib we have to check the existance of.
svn path=/trunk/KDE/kdelibs/; revision=660321
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 10 | ||||
| -rw-r--r-- | modules/FindKMetaData.cmake | 47 | 
2 files changed, 53 insertions, 4 deletions
| diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 427a71cf..43580646 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -472,11 +472,13 @@ else (_kdeBootStrapping)     find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )     set(KDE4_KTEXTEDITOR_LIBS ${ktexteditor_LIB_DEPENDS} ${KDE4_KTEXTEDITOR_LIBRARY} ) -   find_library(KDE4_KNEPOMUK_LIBRARY NAMES knepomuk PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -   set(KDE4_KNEPOMUK_LIBS ${knepomuk_LIB_DEPENDS} ${KDE4_KNEPOMUK_LIBRARY} ) +   # Can't do that, it's not always compiled. +   #find_library(KDE4_KNEPOMUK_LIBRARY NAMES knepomuk PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) +   #set(KDE4_KNEPOMUK_LIBS ${knepomuk_LIB_DEPENDS} ${KDE4_KNEPOMUK_LIBRARY} ) -   find_library(KDE4_KMETADATA_LIBRARY NAMES kmetadata PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) -   set(KDE4_KMETADATA_LIBS ${kmetadata_LIB_DEPENDS} ${KDE4_KMETADATA_LIBRARY} ) +   # Can't do that, it's not always compiled. See FindKMetaData.cmake +   #find_library(KDE4_KMETADATA_LIBRARY NAMES kmetadata PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) +   #set(KDE4_KMETADATA_LIBS ${kmetadata_LIB_DEPENDS} ${KDE4_KMETADATA_LIBRARY} )     get_filename_component(KDE4_LIB_DIR ${KDE4_KDECORE_LIBRARY} PATH ) diff --git a/modules/FindKMetaData.cmake b/modules/FindKMetaData.cmake new file mode 100644 index 00000000..eef6727c --- /dev/null +++ b/modules/FindKMetaData.cmake @@ -0,0 +1,47 @@ +# Once done this will define +# +#  KMETADATA_FOUND - system has KMetaData +#  KMETADATA_INCLUDE_DIR - the KMetaData include directory +#  KMETADATA_LIBRARIES - Link these to use KMetaData +#  KMETADATA_DEFINITIONS - Compiler switches required for using KMetaData +# + +FIND_PATH(KMETADATA_INCLUDE_DIR +  NAMES +  kmetadata/kmetadata.h +  PATHS +  /usr/include +  /usr/local/include +  ${KDE4_INCLUDE_DIR} +  ${INCLUDE_INSTALL_DIR} +) + +FIND_LIBRARY(KMETADATA_LIBRARIES +  NAMES +  kmetadata +  kmetadatatools +  PATHS +  /usr/lib +  /usr/local/lib +  ${KDE4_LIB_DIR} +  ${LIB_INSTALL_DIR} +) + +if(KMETADATA_INCLUDE_DIR AND KMETADATA_LIBRARIES) +  set(KMetaData_FOUND TRUE) +endif(KMETADATA_INCLUDE_DIR AND KMETADATA_LIBRARIES) + +if(KMetaData_FOUND) +  if(NOT KMetaData_FIND_QUIETLY) +    message(STATUS "Found KMetaData: ${KMETADATA_LIBRARIES}") +  endif(NOT KMetaData_FIND_QUIETLY) +else(KMetaData_FOUND) +  if(KMetaData_FIND_REQUIRED) +    if(NOT KMETADATA_INCLUDE_DIR) +      message(FATAL_ERROR "Could not find KMetaData includes.") +    endif(NOT KMETADATA_INCLUDE_DIR) +    if(NOT KMETADATA_LIBRARIES) +      message(FATAL_ERROR "Could not find KMetaData library.") +    endif(NOT KMETADATA_LIBRARIES) +  endif(KMetaData_FIND_REQUIRED) +endif(KMetaData_FOUND) | 
