Changeset 251005 in webkit


Ignore:
Timestamp:
Oct 11, 2019 2:04:12 AM (5 years ago)
Author:
Konstantin Tokarev
Message:

[cmake] Use HINTS instead of PATHS when searching in paths from pkg-config
​https://bugs.webkit.org/show_bug.cgi?id=202831

Reviewed by Carlos Garcia Campos.

HINTS and PATHS sections are similar, however HINTS is processed before
default system locations, while PATHS - after. If target file can be found
in the system, pkg-config results are ignored in case of PATHS, making it
impossible to override system version of library with PKG_CONFIG_PATH.

Note that CMake documentation recommends using PATHS for hard-coded guesses.

  • Source/cmake/FindEnchant.cmake:
  • Source/cmake/FindFontconfig.cmake:
  • Source/cmake/FindLibEpoxy.cmake:
  • Source/cmake/FindLibtasn1.cmake:
  • Source/cmake/FindSqlite.cmake:
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r250870 r251005  
     12019-10-11  Konstantin Tokarev  <annulen@yandex.ru>
     2
     3        [cmake] Use HINTS instead of PATHS when searching in paths from pkg-config
     4        https://bugs.webkit.org/show_bug.cgi?id=202831
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        HINTS and PATHS sections are similar, however HINTS is processed before
     9        default system locations, while PATHS - after. If target file can be found
     10        in the system, pkg-config results are ignored in case of PATHS, making it
     11        impossible to override system version of library with PKG_CONFIG_PATH.
     12
     13        Note that CMake documentation recommends using PATHS for hard-coded guesses.
     14
     15        * Source/cmake/FindEnchant.cmake:
     16        * Source/cmake/FindFontconfig.cmake:
     17        * Source/cmake/FindLibEpoxy.cmake:
     18        * Source/cmake/FindLibtasn1.cmake:
     19        * Source/cmake/FindSqlite.cmake:
     20
    1212019-10-08  Adrian Perez de Castro  <aperez@igalia.com>
    222

  • trunk/Source/cmake/FindEnchant.cmake

    r228826 r251005  
    3838    find_path(ENCHANT_INCLUDE_DIRS
    3939        NAMES enchant.h
    40         PATHS ${PC_ENCHANT_INCLUDEDIR}
     40        HINTS ${PC_ENCHANT_INCLUDEDIR}
    4141              ${PC_ENCHANT_INCLUDE_DIRS}
    4242    )
    … …  
    4444    find_library(ENCHANT_LIBRARIES
    4545        NAMES ${ENCHANT_NAME}
    46         PATHS ${PC_ENCHANT_LIBDIR}
     46        HINTS ${PC_ENCHANT_LIBDIR}
    4747              ${PC_ENCHANT_LIBRARY_DIRS}
    4848    )

  • trunk/Source/cmake/FindFontconfig.cmake

    r136790 r251005  
    5050
    5151    find_path(FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h
    52         PATHS
    53         ${PC_FONTCONFIG_INCLUDEDIR}
    54         ${PC_FONTCONFIG_INCLUDE_DIRS}
    55         /usr/X11/include
     52        HINTS ${PC_FONTCONFIG_INCLUDEDIR} ${PC_FONTCONFIG_INCLUDE_DIRS}
     53        PATHS /usr/X11/include
    5654    )
    5755
    5856    find_library(FONTCONFIG_LIBRARIES NAMES fontconfig
    59         PATHS
    60         ${PC_FONTCONFIG_LIBDIR}
    61         ${PC_FONTCONFIG_LIBRARY_DIRS}
     57        HINTS ${PC_FONTCONFIG_LIBDIR} ${PC_FONTCONFIG_LIBRARY_DIRS}
    6258    )
    6359

  • trunk/Source/cmake/FindLibEpoxy.cmake

    r223045 r251005  
    3737find_path(LIBEPOXY_INCLUDE_DIRS
    3838    NAMES epoxy/gl.h
    39     PATHS ${PC_LIBEPOXY_INCLUDEDIR} ${PC_LIBEPOXY_INCLUDE_DIRS}
     39    HINTS ${PC_LIBEPOXY_INCLUDEDIR} ${PC_LIBEPOXY_INCLUDE_DIRS}
    4040)
    4141
    4242find_library(LIBEPOXY_LIBRARIES
    4343    NAMES epoxy
    44     PATHS ${PC_LIBEPOXY_LIBDIR} ${PC_LIBEPOXY_LIBRARY_DIRS}
     44    HINTS ${PC_LIBEPOXY_LIBDIR} ${PC_LIBEPOXY_LIBRARY_DIRS}
    4545)
    4646

  • trunk/Source/cmake/FindLibtasn1.cmake

    r220595 r251005  
    3434find_path(LIBTASN1_INCLUDE_DIRS
    3535    NAMES libtasn1.h
    36     PATHS ${PC_LIBTASN1_INCLUDEDIR} ${PC_LIBTASN1_INCLUDE_DIRS}
     36    HINTS ${PC_LIBTASN1_INCLUDEDIR} ${PC_LIBTASN1_INCLUDE_DIRS}
    3737)
    3838
    3939find_library(LIBTASN1_LIBRARIES
    4040    NAMES tasn1
    41     PATHS ${PC_LIBTASN1_LIBDIR} ${PC_LIBTASN1_LIBRARY_DIRS}
     41    HINTS ${PC_LIBTASN1_LIBDIR} ${PC_LIBTASN1_LIBRARY_DIRS}
    4242)
    4343

  • trunk/Source/cmake/FindSqlite.cmake

    r136790 r251005  
    4848
    4949find_path(SQLITE_INCLUDE_DIR NAMES sqlite3.h
    50     PATHS
    51     ${PC_SQLITE_INCLUDEDIR}
    52     ${PC_SQLITE_INCLUDE_DIRS}
     50    HINTS ${PC_SQLITE_INCLUDEDIR} ${PC_SQLITE_INCLUDE_DIRS}
    5351)
    5452
    5553find_library(SQLITE_LIBRARIES NAMES sqlite3
    56     PATHS
    57     ${PC_SQLITE_LIBDIR}
    58     ${PC_SQLITE_LIBRARY_DIRS}
     54    HINTS ${PC_SQLITE_LIBDIR} ${PC_SQLITE_LIBRARY_DIRS}
    5955)
    6056
Note: See TracChangeset for help on using the changeset viewer.