Исправлен поиск каталогов (в процессе)
This commit is contained in:
parent
488ef00012
commit
b4c58de05c
@ -4,11 +4,11 @@ if(NOT MYXLIB_IS_EXTERNAL_PROJECT)
|
|||||||
set(MYXLIB_LIBRARY_DIR "" CACHE PATH "The path to the library of an myxlib installation")
|
set(MYXLIB_LIBRARY_DIR "" CACHE PATH "The path to the library of an myxlib installation")
|
||||||
|
|
||||||
set(_search_paths "")
|
set(_search_paths "")
|
||||||
if(EXISTS MYXLIB_INCLUDE_DIR)
|
if(MYXLIB_INCLUDE_DIR AND EXISTS ${MYXLIB_INCLUDE_DIR})
|
||||||
list(APPEND _search_paths ${MYXLIB_INCLUDE_DIR})
|
list(APPEND _search_paths ${MYXLIB_INCLUDE_DIR})
|
||||||
endif()
|
endif()
|
||||||
if(EXISTS MYXLIB_PREFIX)
|
if(MYXLIB_PREFIX AND EXISTS ${MYXLIB_PREFIX})
|
||||||
list(APPEND _search_paths ${MYXLIB_PREFIX}/include)
|
list(APPEND _search_paths "${MYXLIB_PREFIX}/include")
|
||||||
endif()
|
endif()
|
||||||
find_path(
|
find_path(
|
||||||
MYXLIB_INCLUDE_DIRS
|
MYXLIB_INCLUDE_DIRS
|
||||||
@ -16,11 +16,11 @@ if(NOT MYXLIB_IS_EXTERNAL_PROJECT)
|
|||||||
PATHS ${_search_paths})
|
PATHS ${_search_paths})
|
||||||
|
|
||||||
set(_search_paths "")
|
set(_search_paths "")
|
||||||
if(EXISTS MYXLIB_LIBRARY_DIR)
|
if(MYXLIB_LIBRARY_DIR AND EXISTS ${MYXLIB_LIBRARY_DIR})
|
||||||
list(APPEND _search_paths ${MYXLIB_LIBRARY_DIR})
|
list(APPEND _search_paths ${MYXLIB_LIBRARY_DIR})
|
||||||
endif()
|
endif()
|
||||||
if(EXISTS MYXLIB_PREFIX)
|
if(MYXLIB_PREFIX AND EXISTS ${MYXLIB_PREFIX})
|
||||||
list(APPEND _search_paths ${MYXLIB_PREFIX}/lib)
|
list(APPEND _search_paths "${MYXLIB_PREFIX}/lib")
|
||||||
endif()
|
endif()
|
||||||
find_library(
|
find_library(
|
||||||
MYXLIB_QT_LIBRARIES
|
MYXLIB_QT_LIBRARIES
|
||||||
|
Loading…
Reference in New Issue
Block a user