From: Jean-Paul Pelteret Date: Tue, 19 Mar 2019 09:48:18 +0000 (+0100) Subject: Update CMake configuration of SymEngine libraries. X-Git-Tag: v9.1.0-rc1~271^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1794dc428948d94f1f44074495036990426b5477;p=dealii.git Update CMake configuration of SymEngine libraries. --- diff --git a/cmake/modules/FindSYMENGINE.cmake b/cmake/modules/FindSYMENGINE.cmake index ad06245073..9c9dbbba07 100644 --- a/cmake/modules/FindSYMENGINE.cmake +++ b/cmake/modules/FindSYMENGINE.cmake @@ -118,15 +118,15 @@ STRING(REGEX REPLACE REMOVE_DUPLICATES(_symengine_include_dirs) # -# The SYMENGINE_LIBRARIES variable configured by SymEngine only lists the -# libraries, but does not set their paths. So we configure this outselves. +# Get the full path for the SYMENGINE_LIBRARIES. Some of these libraries are +# CMake targets, so we can query them directly for this information. # FOREACH(SYMENGINE_LIBRARY_NAME ${SYMENGINE_LIBRARIES}) - DEAL_II_FIND_LIBRARY(SYMENGINE_LIBRARY - NAMES ${SYMENGINE_LIBRARY_NAME} - HINTS ${SYMENGINE_DIR} - PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib - ) + IF (TARGET ${SYMENGINE_LIBRARY_NAME}) + GET_PROPERTY(SYMENGINE_LIBRARY TARGET ${SYMENGINE_LIBRARY_NAME} PROPERTY LOCATION) + ELSE () + SET(SYMENGINE_LIBRARY ${SYMENGINE_LIBRARY_NAME}) + ENDIF() SET(_symengine_libraries ${_symengine_libraries} ${SYMENGINE_LIBRARY}) ENDFOREACH()