SVN commit 818295 by mlaurent: Use FindPackageHandleStandardArgs M +4 -15 FindIpod.cmake M +4 -14 FindNjb.cmake --- trunk/extragear/multimedia/amarok/cmake/modules/FindIpod.cmake #818294:818295 @@ -31,21 +31,10 @@ PATHS ${_IPODLinkDir} ) - - if (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES) - set(IPOD_FOUND TRUE) - endif (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES) - - if (IPOD_FOUND) - if (NOT Ipod_FIND_QUIETLY) - message(STATUS "Found IPOD: ${IPOD_LIBRARIES}") - endif (NOT Ipod_FIND_QUIETLY) - else (IPOD_FOUND) - if (Ipod_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find IPOD") - endif (Ipod_FIND_REQUIRED) - endif (IPOD_FOUND) - + + include(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ipod DEFAULT_MSG IPOD_INCLUDE_DIR IPOD_LIBRARIES ) + MARK_AS_ADVANCED(IPOD_INCLUDE_DIR IPOD_LIBRARIES) endif (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES) --- trunk/extragear/multimedia/amarok/cmake/modules/FindNjb.cmake #818294:818295 @@ -31,21 +31,11 @@ PATHS ${_NJBLinkDir} ) + + + include(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(Njb DEFAULT_MSG NJB_INCLUDE_DIR NJB_LIBRARIES ) - if (NJB_INCLUDE_DIR AND NJB_LIBRARIES) - set(NJB_FOUND TRUE) - endif (NJB_INCLUDE_DIR AND NJB_LIBRARIES) - - if (NJB_FOUND) - if (NOT Njb_FIND_QUIETLY) - message(STATUS "Found NJB: ${NJB_LIBRARIES}") - endif (NOT Njb_FIND_QUIETLY) - else (NJB_FOUND) - if (Njb_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find NJB") - endif (Njb_FIND_REQUIRED) - endif (NJB_FOUND) - MARK_AS_ADVANCED(NJB_INCLUDE_DIR NJB_LIBRARIES) endif (NJB_INCLUDE_DIR AND NJB_LIBRARIES)