diff --git a/cmake/template_find_header_project.cmake b/cmake/template_find_header_project.cmake index cd828bb838f838aff53ed530662047fb7b678c5a..c3f4bbeb76c4c28d37c704113f85e966248c7e42 100644 --- a/cmake/template_find_header_project.cmake +++ b/cmake/template_find_header_project.cmake @@ -7,6 +7,14 @@ @PHOENIX_PACKAGE_PEDENDENCIES@ +if(@PROJECT_NAME_UPPER@_FOUND) + link_directories(${@PROJECT_NAME_UPPER@_LIBRARY_DIR}) + include_directories(${@PROJECT_NAME_UPPER@_INCLUDE_DIR} ${@PROJECT_NAME_UPPER@_INCLUDE_DIR}/../) + + @EXTRA_INCLUDE_CMAKE@ + return() +endif() + find_path(@PROJECT_NAME_UPPER@_INCLUDE_DIR NAMES @headerFile@ PATHS "${@PROJECT_NAME_UPPER@_PREFIX}/include/@projectName@" ${CMAKE_INSTALL_PREFIX}/include/@projectName@ diff --git a/cmake/template_find_project.cmake b/cmake/template_find_project.cmake index ec19c145aa0430f2336390866de072251d3290cf..63f8e5e2fcabdced2eee99e989d8ec657357c44e 100644 --- a/cmake/template_find_project.cmake +++ b/cmake/template_find_project.cmake @@ -7,6 +7,14 @@ @PHOENIX_PACKAGE_PEDENDENCIES@ +if(@PROJECT_NAME_UPPER@_FOUND) + link_directories(${@PROJECT_NAME_UPPER@_LIBRARY_DIR}) + include_directories(${@PROJECT_NAME_UPPER@_INCLUDE_DIR} ${@PROJECT_NAME_UPPER@_INCLUDE_DIR}/../) + + @EXTRA_INCLUDE_CMAKE@ + return() +endif() + find_path(@PROJECT_NAME_UPPER@_INCLUDE_DIR NAMES @headerFile@ PATHS "${@PROJECT_NAME_UPPER@_PREFIX}/include/@projectName@" ${CMAKE_INSTALL_PREFIX}/include/@projectName@ @@ -15,6 +23,7 @@ find_path(@PROJECT_NAME_UPPER@_INCLUDE_DIR if(@PROJECT_NAME_UPPER@_INCLUDE_DIR) message(STATUS "Found @PROJECT_NAME_UPPER@ headers : ${@PROJECT_NAME_UPPER@_INCLUDE_DIR}") + set(@PROJECT_NAME_UPPER@_INCLUDE_DIR "${@PROJECT_NAME_UPPER@_INCLUDE_DIR}" CACHE STRING "@PROJECT_NAME_UPPER@ include directory") else(@PROJECT_NAME_UPPER@_INCLUDE_DIR) message(FATAL_ERROR "@PROJECT_NAME_UPPER@ headers not found") endif(@PROJECT_NAME_UPPER@_INCLUDE_DIR) @@ -39,6 +48,7 @@ find_path(@PROJECT_NAME_UPPER@_LIBRARY_DIR if(@PROJECT_NAME_UPPER@_LIBRARY_DIR) message(STATUS "Found lib @PROJECT_NAME_UPPER@ : ${@PROJECT_NAME_UPPER@_LIBRARY_DIR}") + set(@PROJECT_NAME_UPPER@_LIBRARY_DIR "${@PROJECT_NAME_UPPER@_LIBRARY_DIR}" CACHE STRING "@PROJECT_NAME_UPPER@ library directory") else(@PROJECT_NAME_UPPER@_LIBRARY_DIR) message(FATAL_ERROR "lib @PROJECT_NAME_UPPER@ not found") endif(@PROJECT_NAME_UPPER@_LIBRARY_DIR)