mirror of
https://github.com/Kitware/CMake.git
synced 2026-04-23 22:58:37 -05:00
Merge topic 'quiet_pkg-config'
99f7d1973cFindGSL: Quiet pkg-config errors655582e931FindLAPACK: Quiet pkg-config errors6dab35e25dFindBLAS: Quiet pkg-config errorsb2a7f73b55FindGLUT: Quiet pkg-config errors Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7128
This commit is contained in:
@@ -273,8 +273,8 @@ endif()
|
||||
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
|
||||
|
||||
if(BLA_PREFER_PKGCONFIG)
|
||||
find_package(PkgConfig)
|
||||
pkg_check_modules(PKGC_BLAS blas)
|
||||
find_package(PkgConfig QUIET)
|
||||
pkg_check_modules(PKGC_BLAS QUIET blas)
|
||||
if(PKGC_BLAS_FOUND)
|
||||
set(BLAS_FOUND ${PKGC_BLAS_FOUND})
|
||||
set(BLAS_LIBRARIES "${PKGC_BLAS_LINK_LIBRARIES}")
|
||||
|
||||
@@ -94,9 +94,9 @@ function(_add_glut_target_simple)
|
||||
IMPORTED_LOCATION "${GLUT_glut_LIBRARY}")
|
||||
endfunction()
|
||||
|
||||
find_package(PkgConfig)
|
||||
find_package(PkgConfig QUIET)
|
||||
if(PKG_CONFIG_FOUND)
|
||||
pkg_check_modules(GLUT glut)
|
||||
pkg_check_modules(GLUT QUIET glut)
|
||||
if(GLUT_FOUND)
|
||||
# GLUT_INCLUDE_DIRS is now the official result variable, but
|
||||
# older versions of CMake only provided GLUT_INCLUDE_DIR.
|
||||
|
||||
@@ -77,7 +77,7 @@ endif()
|
||||
# *NIX systems. See :module:`findpkgconfig`
|
||||
# This will return ``GSL_INCLUDEDIR`` and ``GSL_LIBDIR`` used below.
|
||||
if( GSL_USE_PKGCONFIG )
|
||||
find_package(PkgConfig)
|
||||
find_package(PkgConfig QUIET)
|
||||
pkg_check_modules( GSL QUIET gsl )
|
||||
|
||||
if( EXISTS "${GSL_INCLUDEDIR}" )
|
||||
|
||||
@@ -278,8 +278,8 @@ endif()
|
||||
|
||||
# Search with pkg-config if specified
|
||||
if(BLA_PREFER_PKGCONFIG)
|
||||
find_package(PkgConfig)
|
||||
pkg_check_modules(PKGC_LAPACK lapack)
|
||||
find_package(PkgConfig QUIET)
|
||||
pkg_check_modules(PKGC_LAPACK QUIET lapack)
|
||||
if(PKGC_LAPACK_FOUND)
|
||||
set(LAPACK_FOUND TRUE)
|
||||
set(LAPACK_LIBRARIES "${PKGC_LAPACK_LINK_LIBRARIES}")
|
||||
|
||||
Reference in New Issue
Block a user