Commit 2317b29e authored by Jan Möbius's avatar Jan Möbius

Find comiso config in include when installed

parent 7d192d4c
Pipeline #867 passed with stage
...@@ -23,17 +23,19 @@ file ( ...@@ -23,17 +23,19 @@ file (
"${CMAKE_BINARY_DIR}/Package-*/libs/CoMISo" "${CMAKE_BINARY_DIR}/Package-*/libs/CoMISo"
) )
FIND_PATH( COMISO_INCLUDE_DIR CoMISo/Solver/MISolver.hh
PATHS ${_libdirs}
"${CMAKE_SOURCE_DIR}"
"${CMAKE_SOURCE_DIR}/../" )
# Find CoMISo config file # Find CoMISo config file
FIND_PATH( COMISO_CONFIG_INCLUDE_DIR CoMISo/Config/config.hh FIND_PATH( COMISO_CONFIG_INCLUDE_DIR CoMISo/Config/config.hh
PATHS ${_libdirs} PATHS ${_libdirs}
"${CMAKE_BINARY_DIR}/../" "${CMAKE_BINARY_DIR}/../"
"${CMAKE_BINARY_DIR}/../CoMISo/" ) "${CMAKE_BINARY_DIR}/../CoMISo/"
"${COMISO_INCLUDE_DIR}" )
FIND_PATH( COMISO_INCLUDE_DIR CoMISo/Solver/MISolver.hh message("COMISO_CONFIG_INCLUDE_DIR: ${COMISO_CONFIG_INCLUDE_DIR}")
PATHS ${_libdirs}
"${CMAKE_SOURCE_DIR}"
"${CMAKE_SOURCE_DIR}/../" )
if ( COMISO_INCLUDE_DIR AND COMISO_CONFIG_INCLUDE_DIR ) if ( COMISO_INCLUDE_DIR AND COMISO_CONFIG_INCLUDE_DIR )
...@@ -246,7 +248,12 @@ if ( COMISO_INCLUDE_DIR AND COMISO_CONFIG_INCLUDE_DIR ) ...@@ -246,7 +248,12 @@ if ( COMISO_INCLUDE_DIR AND COMISO_CONFIG_INCLUDE_DIR )
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
SET(COMISO_FOUND TRUE) SET(COMISO_FOUND TRUE)
SET( COMISO_LIBRARY_DIR "${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}" )
FIND_LIBRARY( COMISO_LIBRARY_DIR NAMES CoMISo
PATHS ${SEARCH_PATHS}
"${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_LIBDIR}"
PATH_SUFFIXES lib lib64)
SET( COMISO_LIBRARY "CoMISo") SET( COMISO_LIBRARY "CoMISo")
# SET( COMISO_DEPS "GMM;BLAS;SUITESPARSE" ) # SET( COMISO_DEPS "GMM;BLAS;SUITESPARSE" )
SET( COMISO_DEPS "GMM") SET( COMISO_DEPS "GMM")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment