diff options
| author | Ryan Volz <ryan.volz@gmail.com> | 2021-03-26 16:30:12 -0400 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-04-17 20:00:31 -0400 |
| commit | c6cf6f99329bed4160f2273563f529852365f799 (patch) | |
| tree | c34c14deeb4cae8bbfeca435b5bc24066082f2ef /cmake | |
| parent | f65153f0cc230629526ab44163d33626580b002f (diff) | |
cmake: Fix codec2 and MPIR find modules for Windows (conda).
Signed-off-by: Ryan Volz <ryan.volz@gmail.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/FindCodec2.cmake | 9 | ||||
| -rw-r--r-- | cmake/Modules/FindMPIR.cmake | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cmake/Modules/FindCodec2.cmake b/cmake/Modules/FindCodec2.cmake index 2258bc6284..7525c18043 100644 --- a/cmake/Modules/FindCodec2.cmake +++ b/cmake/Modules/FindCodec2.cmake @@ -17,17 +17,16 @@ INCLUDE(FindPackageHandleStandardArgs) pkg_check_modules(LIBCODEC2_PKG QUIET codec2) find_path(LIBCODEC2_INCLUDE_DIR NAMES codec2.h + HINTS ${LIBCODEC2_PKG_INCLUDE_DIRS} PATHS - ${LIBCODEC2_PKG_INCLUDE_DIRS} - /usr/include/codec2 /usr/include - /usr/local/include/codec2 /usr/local/include + PATH_SUFFIXES codec2 ) -find_library(LIBCODEC2_LIBRARIES NAMES codec2 +find_library(LIBCODEC2_LIBRARIES NAMES codec2 libcodec2 + HINTS ${LIBCODEC2_PKG_LIBRARY_DIRS} PATHS - ${LIBCODEC2_PKG_LIBRARY_DIRS} /usr/lib /usr/local/lib ) diff --git a/cmake/Modules/FindMPIR.cmake b/cmake/Modules/FindMPIR.cmake index 1346af4d29..9735c99e2b 100644 --- a/cmake/Modules/FindMPIR.cmake +++ b/cmake/Modules/FindMPIR.cmake @@ -18,7 +18,8 @@ set(MPIR_PC_ADD_CFLAGS "-I${MPIR_INCLUDE_DIR}") find_library( MPIRXX_LIBRARY - NAMES mpirxx + # mpirxx is bundled into mpir.lib with MSVC + NAMES mpirxx mpir.lib HINTS ${PC_MPIR_LIBDIR} PATHS ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/lib64 |