diff options
| -rw-r--r-- | modules/FindFlac.cmake | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/modules/FindFlac.cmake b/modules/FindFlac.cmake index 56b3eef9..208e3fc3 100644 --- a/modules/FindFlac.cmake +++ b/modules/FindFlac.cmake @@ -15,11 +15,6 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -if(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES) - # Already in cache, be silent - set(Flac_FIND_QUIETLY TRUE) -endif(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES) - FIND_PATH(FLAC_INCLUDE_DIR FLAC/metadata.h) FIND_LIBRARY(FLAC_LIBRARIES NAMES FLAC ) @@ -27,28 +22,12 @@ FIND_LIBRARY(FLAC_LIBRARIES NAMES FLAC ) FIND_LIBRARY(FLAC_OGG_LIBRARY NAMES OggFLAC) +IF(FLAC_LIBRARIES AND FLAC_OGG_LIBRARY) + SET(FLAC_OGGFLAC_LIBRARIES ${FLAC_OGG_LIBRARY} ${FLAC_LIBRARIES}) +ENDIF(FLAC_LIBRARIES AND FLAC_OGG_LIBRARY) -IF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES) - SET(FLAC_FOUND TRUE) - IF (FLAC_OGG_LIBRARY) - SET(FLAC_OGGFLAC_LIBRARIES ${FLAC_OGG_LIBRARY} ${FLAC_LIBRARIES}) - ENDIF (FLAC_OGG_LIBRARY) -ELSE(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES) - SET(FLAC_FOUND FALSE) -ENDIF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES) - -IF(FLAC_FOUND) - IF(NOT Flac_FIND_QUIETLY) - MESSAGE(STATUS "Found Flac: ${FLAC_LIBRARIES}") - ENDIF(NOT Flac_FIND_QUIETLY) -ELSE(FLAC_FOUND) - IF(Flac_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find Flac") - ENDIF(Flac_FIND_REQUIRED) - IF(NOT Flac_FIND_QUIETLY) - MESSAGE(STATUS "Could not find Flac") - ENDIF(NOT Flac_FIND_QUIETLY) -ENDIF(FLAC_FOUND) +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Flac REQUIRED_VARS FLAC_LIBRARIES FLAC_INCLUDE_DIR) # show the FLAC_INCLUDE_DIR and FLAC_LIBRARIES variables only in the advanced view MARK_AS_ADVANCED(FLAC_INCLUDE_DIR FLAC_LIBRARIES FLAC_OGG_LIBRARY) |