diff options
| author | Ryan Volz <ryan.volz@gmail.com> | 2021-05-14 17:21:00 -0400 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-06-01 07:43:04 -0400 |
| commit | e324474c5e8bb772deb5115f09ea6e27dbb0920c (patch) | |
| tree | d4f29bee506a1fdb8a09671d9db8d78706060545 /cmake | |
| parent | d9b205f0fc9c3495f42b422ecd13edcc1a5e75ed (diff) | |
cmake: Uniformly use HINTS and PATH_SUFFIXES in find scripts.
Where appropriate, switch to using the HINTS and PATH_SUFFIXES options
in find_* commands in the CMake find modules. This will more robustly
find the components on Windows and non-standard systems.
Signed-off-by: Ryan Volz <ryan.volz@gmail.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/FindALSA.cmake | 4 | ||||
| -rw-r--r-- | cmake/Modules/FindGSM.cmake | 7 | ||||
| -rw-r--r-- | cmake/Modules/FindJACK.cmake | 6 | ||||
| -rw-r--r-- | cmake/Modules/FindMathJax2.cmake | 11 | ||||
| -rw-r--r-- | cmake/Modules/FindQwt.cmake | 24 | ||||
| -rw-r--r-- | cmake/Modules/Findlibunwind.cmake | 4 |
6 files changed, 30 insertions, 26 deletions
diff --git a/cmake/Modules/FindALSA.cmake b/cmake/Modules/FindALSA.cmake index 13fc974e61..4f25dd7729 100644 --- a/cmake/Modules/FindALSA.cmake +++ b/cmake/Modules/FindALSA.cmake @@ -16,12 +16,12 @@ libfind_pkg_check_modules(ALSA_PKGCONF alsa) find_path(ALSA_INCLUDE_DIR NAMES alsa/version.h - PATHS ${ALSA_PKGCONF_INCLUDE_DIRS} + HINTS ${ALSA_PKGCONF_INCLUDE_DIRS} ) find_library(ALSA_LIBRARY NAMES asound - PATHS ${ALSA_PKGCONF_LIBRARY_DIRS} + HINTS ${ALSA_PKGCONF_LIBRARY_DIRS} ) # Extract the version number diff --git a/cmake/Modules/FindGSM.cmake b/cmake/Modules/FindGSM.cmake index 92898d6320..58e86de861 100644 --- a/cmake/Modules/FindGSM.cmake +++ b/cmake/Modules/FindGSM.cmake @@ -17,17 +17,16 @@ INCLUDE(FindPackageHandleStandardArgs) pkg_check_modules(LIBGSM_PKG QUIET gsm) find_path(LIBGSM_INCLUDE_DIR NAMES gsm.h + HINTS ${LIBGSM_PKG_INCLUDE_DIRS} PATHS - ${LIBGSM_PKG_INCLUDE_DIRS} - /usr/local/include/gsm /usr/local/include - /usr/include/gsm /usr/include + PATH_SUFFIXES gsm ) find_library(LIBGSM_LIBRARIES NAMES gsm + HINTS ${LIBGSM_PKG_LIBRARY_DIRS} PATHS - ${LIBGSM_PKG_LIBRARY_DIRS} /usr/local/lib /usr/lib ) diff --git a/cmake/Modules/FindJACK.cmake b/cmake/Modules/FindJACK.cmake index e0c3f3505e..23c6616f5e 100644 --- a/cmake/Modules/FindJACK.cmake +++ b/cmake/Modules/FindJACK.cmake @@ -31,8 +31,9 @@ else (JACK_LIBRARIES AND JACK_INCLUDE_DIRS) find_path(JACK_INCLUDE_DIR NAMES jack/jack.h - PATHS + HINTS ${_JACK_INCLUDEDIR} + PATHS /usr/include /usr/local/include /opt/local/include @@ -42,8 +43,9 @@ else (JACK_LIBRARIES AND JACK_INCLUDE_DIRS) find_library(JACK_LIBRARY NAMES jack - PATHS + HINTS ${_JACK_LIBDIR} + PATHS /usr/lib /usr/local/lib /opt/local/lib diff --git a/cmake/Modules/FindMathJax2.cmake b/cmake/Modules/FindMathJax2.cmake index 8f61012222..19005ef638 100644 --- a/cmake/Modules/FindMathJax2.cmake +++ b/cmake/Modules/FindMathJax2.cmake @@ -44,11 +44,14 @@ else() find_file(MATHJAX2_JS_PATH NAMES MathJax.js - PATHS + HINTS "${MATHJAX2_ROOT}" - /usr/share/mathjax2/ - /usr/share/javascript/mathjax/ - /usr/local/share/javascript/mathjax/ + PATHS + /usr/share + /usr/local/share + PATH_SUFFIXES + mathjax2 + javascript/mathjax ) get_filename_component(MATHJAX2_PATH ${MATHJAX2_JS_PATH} DIRECTORY) diff --git a/cmake/Modules/FindQwt.cmake b/cmake/Modules/FindQwt.cmake index c9a530b2ee..d660a5f665 100644 --- a/cmake/Modules/FindQwt.cmake +++ b/cmake/Modules/FindQwt.cmake @@ -12,20 +12,20 @@ find_path(QWT_INCLUDE_DIRS NAMES qwt_global.h HINTS ${PC_QWT_INCLUDEDIR} - ${CMAKE_INSTALL_PREFIX}/include/qwt - /include/qwt + ${CMAKE_INSTALL_PREFIX}/include + /include PATHS - /usr/local/include/qwt-${QWT_QT_VERSION} - /usr/local/include/qwt - /usr/include/qwt6 - /usr/include/qt5/qwt - /usr/include/qwt-${QWT_QT_VERSION} - /usr/include/qwt - /usr/include/${QWT_QT_VERSION}/qwt - /usr/include/qwt5 - /opt/local/include/qwt - /sw/include/qwt + /usr/local/include + /usr/include + /opt/local/include + /sw/include /usr/local/lib/qwt.framework/Headers + PATH_SUFFIXES + qwt-${QWT_QT_VERSION} + qwt + qwt6 + qwt5 + ${QWT_QT_VERSION}/qwt ) find_library (QWT_LIBRARIES diff --git a/cmake/Modules/Findlibunwind.cmake b/cmake/Modules/Findlibunwind.cmake index 1985a9fd4b..4875c1a7d6 100644 --- a/cmake/Modules/Findlibunwind.cmake +++ b/cmake/Modules/Findlibunwind.cmake @@ -13,13 +13,13 @@ libfind_pkg_check_modules(libunwind_PKGCONF libunwind) # Include dir find_path(libunwind_INCLUDE_DIR NAMES libunwind.h - PATHS ${libunwind_PKGCONF_INCLUDE_DIRS} + HINTS ${libunwind_PKGCONF_INCLUDE_DIRS} ) # Finally the library itself find_library(libunwind_LIBRARY NAMES unwind - PATHS ${libunwind_PKGCONF_LIBRARY_DIRS} + HINTS ${libunwind_PKGCONF_LIBRARY_DIRS} ) # Set the include dir variables and the libraries and let libfind_process do the rest. |