From: Adam Simpkins Date: Wed, 17 Jan 2018 01:59:08 +0000 (-0800) Subject: cmake: fix path to FindGLog.cmake X-Git-Tag: v2018.01.22.00~26 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=19db503e08e4ea46a8b4d9a272605006b6245f88;p=folly.git cmake: fix path to FindGLog.cmake Summary: The cmake files refer to this package as "FindGLog", but the file name on disk incorrectly had the 'L' lower cased. This worked on case-insensitive file systems, but caused cmake to fail when used on a case-sensitive file system. This diff fixes the file name to match the name used in the cmake files. This is also more consistent with the existing "FindGFlags" and "FindGMock" packages. Reviewed By: yfeldblum Differential Revision: D6710439 fbshipit-source-id: 19f6824ef6793e505b5a0080c0fefe0b145a41c3 --- diff --git a/CMake/FindGLog.cmake b/CMake/FindGLog.cmake new file mode 100755 index 00000000..4338159a --- /dev/null +++ b/CMake/FindGLog.cmake @@ -0,0 +1,23 @@ +# +# Find libglog +# +# LIBGLOG_INCLUDE_DIR - where to find glog/logging.h, etc. +# LIBGLOG_LIBRARY - List of libraries when using libglog. +# LIBGLOG_FOUND - True if libglog found. + + +IF (LIBGLOG_INCLUDE_DIR) + # Already in cache, be silent + SET(LIBGLOG_FIND_QUIETLY TRUE) +ENDIF () + +FIND_PATH(LIBGLOG_INCLUDE_DIR glog/logging.h) + +FIND_LIBRARY(LIBGLOG_LIBRARY glog) + +# handle the QUIETLY and REQUIRED arguments and set LIBGLOG_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBGLOG DEFAULT_MSG LIBGLOG_LIBRARY LIBGLOG_INCLUDE_DIR) + +MARK_AS_ADVANCED(LIBGLOG_LIBRARY LIBGLOG_INCLUDE_DIR) diff --git a/CMake/FindGlog.cmake b/CMake/FindGlog.cmake deleted file mode 100755 index 4338159a..00000000 --- a/CMake/FindGlog.cmake +++ /dev/null @@ -1,23 +0,0 @@ -# -# Find libglog -# -# LIBGLOG_INCLUDE_DIR - where to find glog/logging.h, etc. -# LIBGLOG_LIBRARY - List of libraries when using libglog. -# LIBGLOG_FOUND - True if libglog found. - - -IF (LIBGLOG_INCLUDE_DIR) - # Already in cache, be silent - SET(LIBGLOG_FIND_QUIETLY TRUE) -ENDIF () - -FIND_PATH(LIBGLOG_INCLUDE_DIR glog/logging.h) - -FIND_LIBRARY(LIBGLOG_LIBRARY glog) - -# handle the QUIETLY and REQUIRED arguments and set LIBGLOG_FOUND to TRUE if -# all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBGLOG DEFAULT_MSG LIBGLOG_LIBRARY LIBGLOG_INCLUDE_DIR) - -MARK_AS_ADVANCED(LIBGLOG_LIBRARY LIBGLOG_INCLUDE_DIR)