diff options
| -rw-r--r-- | modules/FindAlsa.cmake | 24 | ||||
| -rw-r--r-- | modules/FindLibXml2.cmake | 2 | ||||
| -rw-r--r-- | modules/FindSoprano.cmake | 2 | ||||
| -rw-r--r-- | modules/FindStrigi.cmake | 11 |
4 files changed, 23 insertions, 16 deletions
diff --git a/modules/FindAlsa.cmake b/modules/FindAlsa.cmake index b4f28d0a..5b8e43f8 100644 --- a/modules/FindAlsa.cmake +++ b/modules/FindAlsa.cmake @@ -18,7 +18,7 @@ include(CheckIncludeFileCXX) include(CheckLibraryExists) # Already done by toplevel -FIND_LIBRARY(ASOUND_LIBRARY asound) +find_library(ASOUND_LIBRARY asound) check_library_exists(asound snd_seq_create_simple_port ${ASOUND_LIBRARY} HAVE_LIBASOUND2) if(HAVE_LIBASOUND2) message(STATUS "Found ALSA: ${ASOUND_LIBRARY}") @@ -26,17 +26,19 @@ else(HAVE_LIBASOUND2) message(STATUS "ALSA not found") endif(HAVE_LIBASOUND2) set(ALSA_FOUND ${HAVE_LIBASOUND2}) -FIND_PATH(ALSA_INCLUDES alsa/version.h) -MACRO(ALSA_VERSION_STRING _result) +find_path(ALSA_INCLUDES alsa/version.h) + +macro(ALSA_VERSION_STRING _result) # check for version in alsa/version.h - IF(ALSA_INCLUDES) - FILE(READ "${ALSA_INCLUDES}/alsa/version.h" _ALSA_VERSION_CONTENT) - STRING(REGEX REPLACE ".*SND_LIB_VERSION_STR.*\"(.*)\".*" "\\1" ${_result} ${_ALSA_VERSION_CONTENT}) - ELSE(ALSA_INCLUDES) - MESSAGE(STATUS "ALSA version not known. ALSA output will probably not work correctly.") - ENDIF(ALSA_INCLUDES) -ENDMACRO(ALSA_VERSION_STRING _result) + if(ALSA_INCLUDES) + file(READ "${ALSA_INCLUDES}/alsa/version.h" _ALSA_VERSION_CONTENT) + string(REGEX REPLACE ".*SND_LIB_VERSION_STR.*\"(.*)\".*" "\\1" ${_result} ${_ALSA_VERSION_CONTENT}) + else(ALSA_INCLUDES) + message(STATUS "ALSA version not known. ALSA output will probably not work correctly.") + endif(ALSA_INCLUDES) +endmacro(ALSA_VERSION_STRING _result) + get_filename_component(_FIND_ALSA_MODULE_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) macro(ALSA_CONFIGURE_FILE _destFile) @@ -58,3 +60,5 @@ macro(ALSA_CONFIGURE_FILE _destFile) configure_file(${_FIND_ALSA_MODULE_DIR}/config-alsa.h.cmake ${_destFile}) endmacro(ALSA_CONFIGURE_FILE _destFile) + +mark_as_advanced(ALSA_INCLUDES ASOUND_LIBRARY) diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index f74cbb58..5f23c184 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -58,5 +58,5 @@ ELSE (LIBXML2_FOUND) ENDIF (LibXml2_FIND_REQUIRED) ENDIF (LIBXML2_FOUND) -MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES) +MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES XMLLINT_EXECUTABLE) diff --git a/modules/FindSoprano.cmake b/modules/FindSoprano.cmake index ca389f9c..93e01a01 100644 --- a/modules/FindSoprano.cmake +++ b/modules/FindSoprano.cmake @@ -111,4 +111,6 @@ endif(Soprano_FIND_REQUIRED) endif(Soprano_FOUND) +mark_as_advanced(SOPRANO_CLIENT_LIBRARIES SOPRANO_INDEX_LIBRARIES SOPRANO_LIBRARIES SOPRANO_SERVER_LIBRARIES SOPRANO_INCLUDE_DIR ) + #endif(SOPRANO_INCLUDE_DIR AND SOPRANO_LIBRARIES AND SOPRANO_INDEX_LIBRARIES AND SOPRANO_SERVER_LIBRARIES) diff --git a/modules/FindStrigi.cmake b/modules/FindStrigi.cmake index 6ad6ec74..b34596e1 100644 --- a/modules/FindStrigi.cmake +++ b/modules/FindStrigi.cmake @@ -81,7 +81,7 @@ if (NOT WIN32 AND NOT HAVE_STRIGI_VERSION) if(_dummyLinkFlags) exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=${STRIGI_MIN_VERSION} - libstreamanalyzer RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) + libstreamanalyzer RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull ) if(NOT _return_VALUE STREQUAL "0") message(STATUS "pkg-config query failed. did you set $PKG_CONFIG_PATH to the directory where strigi libstreamanalyzer.pc is installed?") @@ -94,19 +94,19 @@ if (NOT WIN32 AND NOT HAVE_STRIGI_VERSION) endif(NOT _return_VALUE STREQUAL "0") if (NOT STRIGI_STREAMANALYZER_LIBRARY) find_library(STRIGI_STREAMANALYZER_LIBRARY NAMES streamanalyzer - PATHS ${_dummyLinkDir}) + PATHS ${_dummyLinkDir}) endif(NOT STRIGI_STREAMANALYZER_LIBRARY) if( NOT STRIGI_STRIGIQTDBUSCLIENT_LIBRARY) find_library(STRIGI_STRIGIQTDBUSCLIENT_LIBRARY NAMES strigiqtdbusclient - PATHS ${_dummyLinkDir}) + PATHS ${_dummyLinkDir}) endif(NOT STRIGI_STRIGIQTDBUSCLIENT_LIBRARY) if (NOT STRIGI_STREAMS_LIBRARY) find_library(STRIGI_STREAMS_LIBRARY NAMES streams - PATHS ${_dummyLinkDir}) + PATHS ${_dummyLinkDir}) endif(NOT STRIGI_STREAMS_LIBRARY) if (NOT STRIGI_INCLUDE_DIR) find_path(STRIGI_INCLUDE_DIR strigi/streamanalyzer.h - PATHS ${_dummyIncDir}) + PATHS ${_dummyIncDir}) endif(NOT STRIGI_INCLUDE_DIR) else(_dummyLinkFlags) message(STATUS "pkgconfig didn't find strigi, couldn't check strigi version") @@ -118,3 +118,4 @@ find_package_handle_standard_args(Strigi "Couldn't find Strigi streams library. Set the environment variable STRIGI_HOME (or CMAKE_FIND_PREFIX_PATH if using CMake >=2.5) to the strigi install dir." STRIGI_STREAMS_LIBRARY STRIGI_STREAMANALYZER_LIBRARY STRIGI_INCLUDE_DIR) +mark_as_advanced(STRIGI_INCLUDE_DIR STRIGI_STREAMANALYZER_LIBRARY STRIGI_STREAMS_LIBRARY STRIGI_STRIGIQTDBUSCLIENT_LIBRARY ) |