Compare commits

..

No commits in common. "9f85f524e8da886a0b0c44344bd9e0d7930b1a38" and "650ea04bc8fe4cb534ad1eec3b435c3ef551a267" have entirely different histories.

3 changed files with 7 additions and 36 deletions

View File

@ -1,31 +1,3 @@
#[=======================================================================[.rst:
FindMyxlib
--------
Поиск библиотеки Myxlib
Входные переменные
^^^^^^^^^^^^^^^^^^
``MYXLIB_PREFIX``
корневой каталог установленной библиотеки.
``MYXLIB_INCLUDE_DIR``
каталог, в котором производится поиск заголовочных файлов.
``MYXLIB_LIBRARY_DIR``
каталог, в котором производится поиск библиотек.
Выходные переменные
^^^^^^^^^^^^^^^^^^^
``MYXLIB_FOUND``
true, если MYXLIB найдена
``MYXLIB_INCLUDE_DIRS``
каталог с найденными заголовочными файлами
``MYXLIB_LIBRARIES``
каталог с найденными библиотеками
#]=======================================================================]
if(NOT MYXLIB_IS_EXTERNAL_PROJECT)
set(MYXLIB_PREFIX "" CACHE PATH "The path to the prefix of an myxlib installation")
set(MYXLIB_INCLUDE_DIR "" CACHE PATH "The path to the headers of an myxlib installation")

View File

@ -4,11 +4,11 @@ if(NOT SIGNALVIEW_IS_EXTERNAL_PROJECT)
set(SIGNALVIEW_LIBRARY_DIR "" CACHE PATH "The path to the library of an libsignalview installation")
set(_search_paths "")
if(SIGNALVIEW_INLCUDE_DIR AND EXISTS ${SIGNALVIEW_INCLUDE_DIR})
if(EXISTS SIGNALVIEW_INCLUDE_DIR)
list(APPEND _search_paths ${SIGNALVIEW_INCLUDE_DIR})
endif()
if(SIGNALVIEW_PREFIX AND EXISTS ${SIGNALVIEW_PREFIX})
list(APPEND _search_paths "${SIGNALVIEW_PREFIX}/include")
if(EXISTS SIGNALVIEW_PREFIX)
list(APPEND _search_paths ${SIGNALVIEW_PREFIX}/include)
endif()
find_path(
SIGNALVIEW_INCLUDE_DIRS
@ -16,15 +16,15 @@ if(NOT SIGNALVIEW_IS_EXTERNAL_PROJECT)
PATHS ${_search_paths})
set(_search_paths "")
if(SIGNALVIEW_LIBRARY_DIR AND EXISTS ${SIGNALVIEW_LIBRARY_DIR})
if(EXISTS SIGNALVIEW_LIBRARY_DIR)
list(APPEND _search_paths ${SIGNALVIEW_LIBRARY_DIR})
endif()
if(SIGNALVIEW_PREFIX AND EXISTS ${SIGNALVIEW_PREFIX})
list(APPEND _search_paths "${SIGNALVIEW_PREFIX}/lib")
if(EXISTS SIGNALVIEW_PREFIX)
list(APPEND _search_paths ${SIGNALVIEW_PREFIX}/lib)
endif()
find_library(
SIGNALVIEW_LIBRARIES
NAMES signalview
NAMES fsp
PATHS ${_search_paths})
unset(_search_paths)

View File

@ -13,7 +13,6 @@ if(NOT VEER_PROTOCOLS_IS_EXTERNAL_PROJECT)
VEER_PROTOCOLS_INCLUDE_DIRS
NAMES veer/common/ports.hpp
PATHS ${_search_paths})
unset(_search_paths)
if(VEER_PROTOCOLS_INCLUDE_DIRS)
set(VEER_PROTOCOLS_FOUND TRUE)