Update coding style, use FIND_PACKAGE_HANDLE_STANDARD_ARGS
instead of doing handmade stuff to the same effect. svn path=/trunk/; revision=52352
This commit is contained in:
parent
0e6a5331a1
commit
f485beaf4a
|
@ -17,17 +17,17 @@
|
|||
|
||||
INCLUDE( FindPkgConfig )
|
||||
|
||||
IF ( GTHREAD2_FIND_REQUIRED )
|
||||
IF( GTHREAD2_FIND_REQUIRED )
|
||||
SET( _pkgconfig_REQUIRED "REQUIRED" )
|
||||
ELSE( GTHREAD2_FIND_REQUIRED )
|
||||
ELSE()
|
||||
SET( _pkgconfig_REQUIRED "" )
|
||||
ENDIF ( GTHREAD2_FIND_REQUIRED )
|
||||
ENDIF()
|
||||
|
||||
IF ( GTHREAD2_MIN_VERSION )
|
||||
IF( GTHREAD2_MIN_VERSION )
|
||||
PKG_SEARCH_MODULE( GTHREAD2 ${_pkgconfig_REQUIRED} gthread-2.0>=${GTHREAD2_MIN_VERSION} )
|
||||
ELSE ( GTHREAD2_MIN_VERSION )
|
||||
ELSE()
|
||||
PKG_SEARCH_MODULE( GTHREAD2 ${_pkgconfig_REQUIRED} gthread-2.0 )
|
||||
ENDIF ( GTHREAD2_MIN_VERSION )
|
||||
ENDIF()
|
||||
|
||||
|
||||
IF( NOT GTHREAD2_FOUND AND NOT PKG_CONFIG_FOUND )
|
||||
|
@ -36,30 +36,29 @@ IF( NOT GTHREAD2_FOUND AND NOT PKG_CONFIG_FOUND )
|
|||
FindWSWinLibs("gtk2" "GTHREAD2_HINTS")
|
||||
|
||||
FIND_PATH( GTHREAD2_INCLUDE_DIRS gthread.h PATH_SUFFIXES glib-2.0 glib GLib.framework/Headers/glib glib-2.0/glib HINTS "${GTHREAD2_HINTS}/include" )
|
||||
IF ( APPLE )
|
||||
IF( APPLE )
|
||||
FIND_LIBRARY( GTHREAD2_LIBRARIES glib )
|
||||
ELSE ( APPLE )
|
||||
ELSE()
|
||||
FIND_LIBRARY( GTHREAD2_LIBRARIES gthread-2.0 HINTS "${GTHREAD2_HINTS}/lib" )
|
||||
ENDIF ( APPLE )
|
||||
ENDIF()
|
||||
|
||||
#MESSAGE( STATUS "Gthread headers: ${GTHREAD2_INCLUDE_DIRS}" )
|
||||
#MESSAGE( STATUS "Gthread libs: ${GTHREAD2_LIBRARIES}" )
|
||||
INCLUDE(FindPackageHandleStandardArgs)
|
||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTHREAD2 DEFAULT_MSG GTHREAD2_LIBRARIES GTHREAD2_INCLUDE_DIRS)
|
||||
|
||||
# Report results
|
||||
IF ( GTHREAD2_LIBRARIES AND GTHREAD2_INCLUDE_DIRS )
|
||||
SET( GTHREAD2_FOUND 1 )
|
||||
IF ( NOT GTHREAD2_FIND_QUIETLY )
|
||||
IF( GTHREAD2_FOUND )
|
||||
IF( NOT GTHREAD2_FIND_QUIETLY )
|
||||
MESSAGE( STATUS "Found GTHREAD2: ${GTHREAD2_LIBRARIES} ${GTHREAD2_INCLUDE_DIRS}" )
|
||||
ENDIF ( NOT GTHREAD2_FIND_QUIETLY )
|
||||
ELSE ( GTHREAD2_LIBRARIES AND GTHREAD2_INCLUDE_DIRS )
|
||||
IF ( GTHREAD2_FIND_REQUIRED )
|
||||
ENDIF()
|
||||
ELSE()
|
||||
IF( GTHREAD2_FIND_REQUIRED )
|
||||
MESSAGE( SEND_ERROR "Could NOT find GTHREAD2" )
|
||||
ELSE ( GTHREAD2_FIND_REQUIRED )
|
||||
IF ( NOT GTHREAD2_FIND_QUIETLY )
|
||||
ELSE()
|
||||
IF( NOT GTHREAD2_FIND_QUIETLY )
|
||||
MESSAGE( STATUS "Could NOT find GTHREAD2" )
|
||||
ENDIF ( NOT GTHREAD2_FIND_QUIETLY )
|
||||
ENDIF ( GTHREAD2_FIND_REQUIRED )
|
||||
ENDIF ( GTHREAD2_LIBRARIES AND GTHREAD2_INCLUDE_DIRS )
|
||||
ENDIF( NOT GTHREAD2_FOUND AND NOT PKG_CONFIG_FOUND )
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
MARK_AS_ADVANCED( GTHREAD2_LIBRARIES GTHREAD2_INCLUDE_DIRS )
|
||||
|
|
Loading…
Reference in New Issue