f1x1t/cmake-find
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Исправление поиска каталогов (закончено)

Browse Source
This commit is contained in:
Andrei Astafev 2021-06-29 12:56:20 +03:00
parent 9f85f524e8
commit 4ffa65694c
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
FindMPFR.cmake
View File

@ -10,14 +10,13 @@
set(MPFR_PREFIX "" CACHE PATH "The path to the prefix of an MPFR installation") set(MPFR_PREFIX "" CACHE PATH "The path to the prefix of an MPFR installation")
find_path(MPFR_INCLUDE_DIR mpfr.h find_path(MPFR_INCLUDE_DIRS mpfr.h
PATHS ${MPFR_PREFIX}/include) PATHS ${MPFR_PREFIX}/include)
find_library(MPFR_LIBRARIES NAMES mpfr find_library(MPFR_LIBRARIES NAMES mpfr
PATHS ${MPFR_PREFIX}/lib) PATHS ${MPFR_PREFIX}/lib)
if(MPFR_INCLUDE_DIR AND MPFR_LIBRARIES) if(MPFR_INCLUDE_DIRS AND MPFR_LIBRARIES)
get_filename_component(MPFR_LIBRARY_DIR ${MPFR_LIBRARIES} PATH)
set(MPFR_FOUND TRUE) set(MPFR_FOUND TRUE)
endif() endif()

12
FindPreproc.cmake
View File

@ -4,11 +4,11 @@ if(NOT PREPROC_IS_EXTERNAL_PROJECT)
set(PREPROC_LIBRARY_DIR "" CACHE PATH "The path to the library of an libpreproc installation") set(PREPROC_LIBRARY_DIR "" CACHE PATH "The path to the library of an libpreproc installation")
set(_search_paths "") set(_search_paths "")
if(EXISTS PREPROC_INCLUDE_DIR) if(PREPROC_INCLUDE_DIR AND EXISTS ${PREPROC_INCLUDE_DIR})
list(APPEND _search_paths ${PREPROC_INCLUDE_DIR}) list(APPEND _search_paths ${PREPROC_INCLUDE_DIR})
endif() endif()
if(EXISTS PREPROC_PREFIX) if(PREPROC_PREFIX AND EXISTS ${PREPROC_PREFIX})
list(APPEND _search_paths ${PREPROC_PREFIX}/include) list(APPEND _search_paths "${PREPROC_PREFIX}/include")
endif() endif()
find_path( find_path(
PREPROC_INCLUDE_DIRS PREPROC_INCLUDE_DIRS
@ -16,11 +16,11 @@ if(NOT PREPROC_IS_EXTERNAL_PROJECT)
PATHS ${_search_paths}) PATHS ${_search_paths})
set(_search_paths "") set(_search_paths "")
if(EXISTS PREPROC_LIBRARY_DIR) if(PREPROC_LIBRARY_DIR AND EXISTS ${PREPROC_LIBRARY_DIR})
list(APPEND _search_paths ${PREPROC_LIBRARY_DIR}) list(APPEND _search_paths ${PREPROC_LIBRARY_DIR})
endif() endif()
if(EXISTS PREPROC_PREFIX) if(PREPROC_PREFIX AND EXISTS ${PREPROC_PREFIX})
list(APPEND _search_paths ${PREPROC_PREFIX}/lib) list(APPEND _search_paths "${PREPROC_PREFIX}/lib")
endif() endif()
find_library( find_library(
PREPROC_LIBRARIES PREPROC_LIBRARIES