support for <module>_DIR search dir
This commit is contained in:
@@ -14,7 +14,7 @@ shstk_add_directories(domain)
|
|||||||
|
|
||||||
shstk_add_directories_with_include(is_qt domain)
|
shstk_add_directories_with_include(is_qt domain)
|
||||||
|
|
||||||
shstk_set_find_dirs(domain)
|
shstk_set_find_dirs(domain module)
|
||||||
|
|
||||||
shstk_find_header(module filename add_find_info)
|
shstk_find_header(module filename add_find_info)
|
||||||
|
|
||||||
@@ -263,7 +263,7 @@ macro(shstk_add_directories_with_include is_qt domain)
|
|||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
|
|
||||||
macro(shstk_set_find_dirs domain)
|
macro(shstk_set_find_dirs domain module)
|
||||||
#set(_PIP_INCDIR "${PIP_DIR}/include/pip")
|
#set(_PIP_INCDIR "${PIP_DIR}/include/pip")
|
||||||
#set(_PIP_LIBDIR "${PIP_DIR}/lib")
|
#set(_PIP_LIBDIR "${PIP_DIR}/lib")
|
||||||
set(${domain}_INCDIR)
|
set(${domain}_INCDIR)
|
||||||
@@ -275,6 +275,11 @@ macro(shstk_set_find_dirs domain)
|
|||||||
# list(APPEND ${domain}_INCDIR "${${domain}_ROOT_SRC}")
|
# list(APPEND ${domain}_INCDIR "${${domain}_ROOT_SRC}")
|
||||||
# list(APPEND ${domain}_LIBDIR "${${domain}_ROOT_BIN}")
|
# list(APPEND ${domain}_LIBDIR "${${domain}_ROOT_BIN}")
|
||||||
#endif()
|
#endif()
|
||||||
|
if(DEFINED ${module}_DIR)
|
||||||
|
list(APPEND ${domain}_LIBDIR "${${module}_DIR}/lib")
|
||||||
|
list(APPEND ${domain}_INCDIR "${${module}_DIR}/include/${domain}")
|
||||||
|
list(APPEND ${domain}_BINDIR "${${module}_DIR}/bin")
|
||||||
|
endif()
|
||||||
if(MINGW_INCLUDE)
|
if(MINGW_INCLUDE)
|
||||||
list(APPEND ${domain}_INCDIR "${MINGW_INCLUDE}/${domain}")
|
list(APPEND ${domain}_INCDIR "${MINGW_INCLUDE}/${domain}")
|
||||||
list(APPEND ${domain}_LIBDIR "${MINGW_LIB}")
|
list(APPEND ${domain}_LIBDIR "${MINGW_LIB}")
|
||||||
|
|||||||
Reference in New Issue
Block a user