Commit 6ac95bbe authored by Antonio Cervone's avatar Antonio Cervone
Browse files

add rythmos as optional package and properly set HAVE_NOX_THYRA

parent 226acd7c
......@@ -49,6 +49,33 @@ FOREACH( PACKAGE ${REQUIRED_PACKAGES})
ENDIF()
ENDFOREACH(PACKAGE ${REQUIRED_PACKAGES})
#optional packages
SET( OPTIONAL_PACKAGES "rythmos")
#Now I check if all the required packages are in the list of Trilinos Packages. (This might be done better with a find...)
FOREACH( PACKAGE ${OPTIONAL_PACKAGES})
STRING(TOUPPER ${PACKAGE} UPACK)
FOREACH(Tpack ${Trilinos_PACKAGE_LIST})
STRING(TOUPPER ${Tpack} TPACK)
IF(${UPACK} STREQUAL ${TPACK})
SET(${UPACK}_FOUND TRUE)
ENDIF()
ENDFOREACH(Tpack ${Trilinos_PACKAGE_LIST})
IF(${UPACK}_FOUND)
set( HAVE_TRILINOS_${UPACK} TRUE)
ELSE()
MESSAGE( STATUS "Could not find ${PACKAGE}")
ENDIF()
ENDFOREACH(PACKAGE ${REQUIRED_PACKAGES})
#temporary hack to prperly set HAVE_NOX_THYRA
FOREACH(Tpack ${Trilinos_PACKAGE_LIST})
STRING(TOUPPER ${Tpack} TPACK)
IF(${UPACK} STREQUAL "noxthyra")
SET(HAVE_NOX_THYRA TRUE)
ENDIF()
ENDFOREACH(Tpack ${Trilinos_PACKAGE_LIST})
#If XXX is already linked through Trilinos. If so I set the variable XXX_IS_IN_TRILINOS to true
FOREACH(tpl ${Trilinos_TPL_LIST})
STRING(TOUPPER ${tpl} TPL)
......
......@@ -117,6 +117,9 @@
/* Define if the Trilinos RTOp library is used. */
#cmakedefine HAVE_TRILINOS_RTOP
/* Define if the Trilinos Rythmos library is used. */
#cmakedefine HAVE_TRILINOS_RYTHMOS
/* Define if the Trilinos Sacado library is used. */
#cmakedefine HAVE_TRILINOS_SACADO
......@@ -138,6 +141,9 @@
/* Define if the Trilinos Zoltan library is used. */
#cmakedefine HAVE_TRILINOS_ZOLTAN
/* Define if the Trilinos Nox-thyra library is used. */
#cmakedefine HAVE_NOX_THYRA
/*******************************************************************
The following cannot yet be defined due to limitations in the
CMake scripts. Useless defines should be removed
......@@ -164,9 +170,6 @@
/* Define if the Trilinos Nox-epetra library is used. */
#undef HAVE_NOX_EPETRA
/* Define if the Trilinos Nox-thyra library is used. */
#undef HAVE_NOX_THYRA
/* Define if the Trilinos Stratimikos-amesos library is used. */
#undef HAVE_STRATIMIKOS_AMESOS
......
Supports Markdown
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