From 825b1f42738f9ed93f44f02e6302248369e70784 Mon Sep 17 00:00:00 2001 From: Caner Candan Date: Wed, 26 Oct 2011 10:07:01 +0200 Subject: [PATCH] * FindEO: made compatible with pkgconfig finder --- eo/cmake/modules/FindEO.cmake | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/eo/cmake/modules/FindEO.cmake b/eo/cmake/modules/FindEO.cmake index 0ca6a0178..8bf3ac130 100644 --- a/eo/cmake/modules/FindEO.cmake +++ b/eo/cmake/modules/FindEO.cmake @@ -3,8 +3,8 @@ # Version: 0.0.1 # # The following variables are filled out: -# - EO_INCLUDE_DIR -# - EO_LIBRARY_DIR +# - EO_INCLUDE_DIRS +# - EO_LIBRARY_DIRS # - EO_LIBRARIES # - EO_FOUND # @@ -53,25 +53,25 @@ IF(EO_FIND_COMPONENTS) ENDIF(NOT EO_USE_CMA) ENDIF(EO_FIND_COMPONENTS) -IF(NOT EO_INCLUDE_DIR) +IF(NOT EO_INCLUDE_DIRS) FIND_PATH( - EO_INCLUDE_DIR + EO_INCLUDE_DIRS EO.h PATHS /usr/include/eo /usr/local/include/eo ) -ENDIF(NOT EO_INCLUDE_DIR) +ENDIF(NOT EO_INCLUDE_DIRS) -IF(NOT EO_LIBRARY_DIR) +IF(NOT EO_LIBRARY_DIRS) FIND_PATH( - EO_LIBRARY_DIR + EO_LIBRARY_DIRS libeo.a PATHS /usr/lib /usr/local/lib ) -ENDIF(NOT EO_LIBRARY_DIR) +ENDIF(NOT EO_LIBRARY_DIRS) IF(NOT EO_LIBRARIES) SET(EO_LIBRARIES) @@ -91,10 +91,10 @@ IF(NOT EO_LIBRARIES) ENDFOREACH(component) ENDIF(NOT EO_LIBRARIES) -IF(EO_INCLUDE_DIR AND EO_LIBRARY_DIR AND EO_LIBRARIES) +IF(EO_INCLUDE_DIRS AND EO_LIBRARY_DIRS AND EO_LIBRARIES) SET(EO_FOUND 1) MARK_AS_ADVANCED(EO_FOUND) - MARK_AS_ADVANCED(EO_INCLUDE_DIR) - MARK_AS_ADVANCED(EO_LIBRARY_DIR) + MARK_AS_ADVANCED(EO_INCLUDE_DIRS) + MARK_AS_ADVANCED(EO_LIBRARY_DIRS) MARK_AS_ADVANCED(EO_LIBRARIES) -ENDIF(EO_INCLUDE_DIR AND EO_LIBRARY_DIR AND EO_LIBRARIES) +ENDIF(EO_INCLUDE_DIRS AND EO_LIBRARY_DIRS AND EO_LIBRARIES)