diff options
| author | Joerg Mayer <jmayer@loplof.de> | 2014-06-17 16:20:56 +0200 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2014-06-17 14:29:52 +0000 |
| commit | f847b92b0857b3503a6c652a8ddcd159bd774a85 (patch) | |
| tree | 6df7a15a7eab7e4f6124841ec87d0d9e8a20e123 | |
| parent | 5ca64ca97b101ff09b224a30447e9d39b622728c (diff) | |
It's so simple: If we require a package but provide alternative methods
of finding the package don't allow the first method to fail terminally.
Todo: Fix this in all other places as well.
Change-Id: I5a343fac33f6a5d6e50ff353d739459b2e36711a
Reviewed-on: https://code.wireshark.org/review/2300
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
| -rw-r--r-- | cmake/modules/FindGLIB2.cmake | 11 | ||||
| -rw-r--r-- | cmake/modules/FindGTHREAD2.cmake | 14 |
2 files changed, 10 insertions, 15 deletions
diff --git a/cmake/modules/FindGLIB2.cmake b/cmake/modules/FindGLIB2.cmake index 30fd04d45e..8f8d3cbc99 100644 --- a/cmake/modules/FindGLIB2.cmake +++ b/cmake/modules/FindGLIB2.cmake @@ -29,16 +29,11 @@ else() endif() find_package( PkgConfig ) -if( GLIB2_FIND_REQUIRED ) - set( _pkgconfig_REQUIRED "REQUIRED" ) -else() - set( _pkgconfig_REQUIRED "" ) -endif() if( GLIB2_MIN_VERSION ) - pkg_search_module( GLIB2 ${_pkgconfig_REQUIRED} glib-2.0>=${GLIB2_MIN_VERSION} ) + pkg_search_module( GLIB2 glib-2.0>=${GLIB2_MIN_VERSION} ) else() - pkg_search_module( GLIB2 ${_pkgconfig_REQUIRED} glib-2.0 ) + pkg_search_module( GLIB2 glib-2.0 ) endif() find_path( GLIB2_MAIN_INCLUDE_DIR @@ -102,6 +97,8 @@ find_package_handle_standard_args( GLIB2 if( GLIB2_FOUND ) set( GLIB2_LIBRARIES ${GLIB2_LIBRARY} ) set( GLIB2_INCLUDE_DIRS ${GLIB2_MAIN_INCLUDE_DIR} ${GLIB2_INTERNAL_INCLUDE_DIR} ) +elseif( GLIB2_FIND_REQUIRED ) + message( SEND_ERROR "Package required but not found" ) else() set( GLIB2_LIBRARIES ) set( GLIB2_MAIN_INCLUDE_DIRS ) diff --git a/cmake/modules/FindGTHREAD2.cmake b/cmake/modules/FindGTHREAD2.cmake index 94f5bb1cbe..228236a7ab 100644 --- a/cmake/modules/FindGTHREAD2.cmake +++ b/cmake/modules/FindGTHREAD2.cmake @@ -15,16 +15,10 @@ include( FindPkgConfig ) -if( GTHREAD2_FIND_REQUIRED ) - set( _pkgconfig_REQUIRED "REQUIRED" ) -else() - set( _pkgconfig_REQUIRED "" ) -endif() - if( GTHREAD2_MIN_VERSION ) - PKG_SEARCH_MODULE( GTHREAD2 ${_pkgconfig_REQUIRED} gthread-2.0>=${GTHREAD2_MIN_VERSION} ) + PKG_SEARCH_MODULE( GTHREAD2 gthread-2.0>=${GTHREAD2_MIN_VERSION} ) else() - PKG_SEARCH_MODULE( GTHREAD2 ${_pkgconfig_REQUIRED} gthread-2.0 ) + PKG_SEARCH_MODULE( GTHREAD2 gthread-2.0 ) endif() if( GTHREAD2_FOUND ) @@ -51,6 +45,10 @@ else() endif() include( FindPackageHandleStandardArgs ) find_package_handle_standard_args( GTHREAD2 DEFAULT_MSG GTHREAD2_LIBRARIES GTHREAD2_INCLUDE_DIRS ) + if( NOT GTHREAD2_FOUND AND GTHREAD2_FIND_REQUIRED ) + message( SEND_ERROR "Package required but not found" ) + endif() endif() + mark_as_advanced( GTHREAD2_LIBRARIES GTHREAD2_INCLUDE_DIRS ) |