From 5f8b6de153dc3ab62402c11d04d312003a0a249c Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 17 Jul 2014 16:28:15 -0700 Subject: [PATCH] cleanup the Faceplus find module --- cmake/modules/FindFaceplus.cmake | 35 ++++++++------------------------ 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/cmake/modules/FindFaceplus.cmake b/cmake/modules/FindFaceplus.cmake index 2a2083d6e4..6783262254 100644 --- a/cmake/modules/FindFaceplus.cmake +++ b/cmake/modules/FindFaceplus.cmake @@ -12,31 +12,14 @@ # Copyright (c) 2014 High Fidelity # -if (FACEPLUS_LIBRARIES AND FACEPLUS_INCLUDE_DIRS) - # in cache already - set(FACEPLUS_FOUND TRUE) -else (FACEPLUS_LIBRARIES AND FACEPLUS_INCLUDE_DIRS) - find_path(FACEPLUS_INCLUDE_DIRS faceplus.h ${FACEPLUS_ROOT_DIR}/include) +find_path(FACEPLUS_INCLUDE_DIRS faceplus.h ${FACEPLUS_ROOT_DIR}/include) - if (WIN32) - find_library(FACEPLUS_LIBRARIES faceplus.lib ${FACEPLUS_ROOT_DIR}/win32/) - endif (WIN32) +if (WIN32) + find_library(FACEPLUS_LIBRARIES faceplus.lib ${FACEPLUS_ROOT_DIR}/win32/) +endif (WIN32) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(FACEPLUS DEFAULT_MSG FACEPLUS_INCLUDE_DIRS FACEPLUS_LIBRARIES) - if (FACEPLUS_INCLUDE_DIRS AND FACEPLUS_LIBRARIES) - set(FACEPLUS_FOUND TRUE) - endif (FACEPLUS_INCLUDE_DIRS AND FACEPLUS_LIBRARIES) - - if (FACEPLUS_FOUND) - if (NOT FACEPLUS_FIND_QUIETLY) - message(STATUS "Found Faceplus... ${FACEPLUS_LIBRARIES}") - endif (NOT FACEPLUS_FIND_QUIETLY) - else () - if (FACEPLUS_FIND_REQUIRED) - message(FATAL_ERROR "Could not find Faceplus") - endif (FACEPLUS_FIND_REQUIRED) - endif () - - # show the FACEPLUS_INCLUDE_DIRS and FACEPLUS_LIBRARIES variables only in the advanced view - mark_as_advanced(FACEPLUS_INCLUDE_DIRS FACEPLUS_LIBRARIES) - -endif (FACEPLUS_LIBRARIES AND FACEPLUS_INCLUDE_DIRS) +# show the FACEPLUS_INCLUDE_DIRS and FACEPLUS_LIBRARIES variables only in the advanced view +mark_as_advanced(FACEPLUS_INCLUDE_DIRS FACEPLUS_LIBRARIES)