diff options
| -rw-r--r-- | modules/FindGLIB2.cmake | 40 | ||||
| -rw-r--r-- | modules/FindMsgfmt.cmake | 2 |
2 files changed, 14 insertions, 28 deletions
diff --git a/modules/FindGLIB2.cmake b/modules/FindGLIB2.cmake index 65f65bea..bb4dc72f 100644 --- a/modules/FindGLIB2.cmake +++ b/modules/FindGLIB2.cmake @@ -9,35 +9,21 @@ if(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES) # Already in cache, be silent set(GLIB2_FIND_QUIETLY TRUE) endif(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES) -IF (NOT WIN32) - INCLUDE(UsePkgConfig) - PKGCONFIG(glib-2.0 _LibGLIB2IncDir _LibGLIB2LinkDir _LibGLIB2LinkFlags _LibGLIB2Cflags) -endif(NOT WIN32) -FIND_PATH(GLIB2_INCLUDE_DIR glib.h - ${_LibGLIB2IncDir} - ${_LibGLIB2IncDir}/glib-2.0 - /usr/include/glib-2.0 - /usr/local/include/glib-2.0 -) +if (NOT WIN32) + include(UsePkgConfig) + pkgconfig(glib-2.0 _LibGLIB2IncDir _LibGLIB2LinkDir _LibGLIB2LinkFlags _LibGLIB2Cflags) +endif(NOT WIN32) -FIND_LIBRARY(GLIB2_LIBRARIES NAMES glib-2.0 - PATHS - ${_LibGLIB2LinkDir} -) +find_path(GLIB2_INCLUDE_DIR glib.h + PATH_SUFFIXES glib-2.0 + PATHS ${_LibGLIB2IncDir} ) -if(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES) - set(GLIB2_FOUND TRUE) -endif(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES) +find_library(GLIB2_LIBRARIES + NAMES glib-2.0 + PATHS ${_LibGLIB2LinkDir} ) -if(GLIB2_FOUND) - if(NOT GLIB2_FIND_QUIETLY) - message(STATUS "Found glib2: ${GLIB2_LIBRARIES} ${GLIB2_LIBRARIES}") - endif(NOT GLIB2_FIND_QUIETLY) -else(GLIB2_FOUND) - if (GLIB2_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find glib2 library") - endif (GLIB2_FIND_REQUIRED) -endif(GLIB2_FOUND) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(GLIB2 DEFAULT_MSG GLIB2_LIBRARIES GLIB2_INCLUDE_DIR) -MARK_AS_ADVANCED(GLIB2_INCLUDE_DIR GLIB2_LIBRARIES) +mark_as_advanced(GLIB2_INCLUDE_DIR GLIB2_LIBRARIES) diff --git a/modules/FindMsgfmt.cmake b/modules/FindMsgfmt.cmake index cc9912ea..f578b3a2 100644 --- a/modules/FindMsgfmt.cmake +++ b/modules/FindMsgfmt.cmake @@ -14,7 +14,7 @@ if(MSGFMT_EXECUTABLE) set(MSGFMT_FOUND TRUE) else(MSGFMT_EXECUTABLE) - FIND_PROGRAM(MSGFMT_EXECUTABLE NAMES msgfmt PATHS /usr/local/bin ) + FIND_PROGRAM(MSGFMT_EXECUTABLE NAMES msgfmt) if (MSGFMT_EXECUTABLE) set(MSGFMT_FOUND TRUE) else (MSGFMT_EXECUTABLE) |