From: turcksin Date: Fri, 16 May 2014 22:39:58 +0000 (+0000) Subject: Make cmake add paralution include directory in Make.global_options. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67274c6bb3f848544045fc9b4c380db25c40d3f3;p=dealii-svn.git Make cmake add paralution include directory in Make.global_options. git-svn-id: https://svn.dealii.org/branches/branch_paralution@32931 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/configure/configure_2_paralution.cmake b/deal.II/cmake/configure/configure_2_paralution.cmake index d495313635..7ba4d99a1c 100644 --- a/deal.II/cmake/configure/configure_2_paralution.cmake +++ b/deal.II/cmake/configure/configure_2_paralution.cmake @@ -21,9 +21,6 @@ MACRO(FEATURE_PARALUTION_CONFIGURE_EXTERNAL) - SET(PARALUTION_ADD_TO_USER_INCLUDE_DIRS TRUE) - REGISTER_FEATURE(PARALUTION) - SET(DEAL_II_EXPAND_PARALUTION_VECTOR_FLOAT "ParalutionWrappers::Vector") SET(DEAL_II_EXPAND_PARALUTION_VECTOR_DOUBLE "ParalutionWrappers::Vector") diff --git a/deal.II/cmake/modules/FindPARALUTION.cmake b/deal.II/cmake/modules/FindPARALUTION.cmake index 7a1a5fb0ec..caf374cb72 100644 --- a/deal.II/cmake/modules/FindPARALUTION.cmake +++ b/deal.II/cmake/modules/FindPARALUTION.cmake @@ -19,8 +19,8 @@ # # This module exports # -# PARALUTION_INCLUDE_DIRS -# PARALUTION_LIBRARIES +# PARALUTION_INCLUDE_DIR +# PARALUTION_LIBRARY # PARALUTION_VERSION # PARALUTION_VERSION_MAJOR # PARALUTION_VERSION_MINOR @@ -58,10 +58,10 @@ MARK_AS_ADVANCED( ) IF(PARALUTION_FOUND) - SET(PARALUTION_INCLUDE_DIRS + SET(PARALUTION_INCLUDE_DIR ${PARALUTION_INCLUDE_DIR} ) - SET(PARALUTION_LIBRARIES + SET(PARALUTION_LIBRARY ${PARALUTION_LIBRARY} ) FILE(STRINGS "${PARALUTION_INCLUDE_DIR}/base/version.hpp" PARALUTION_VERSION_MAJOR_STRING @@ -92,3 +92,14 @@ ELSE() "An optional hint to a paralution directory" ) ENDIF() + +DEAL_II_PACKAGE_HANDLE(PARALUTION + LIBRARIES + REQUIRED PARALUTION_LIBRARY + INCLUDE_DIRS + REQUIRED PARALUTION_INCLUDE_DIR + USER_INCLUDE_DIRS + REQUIRED PARALUTION_INCLUDE_DIR + CLEAR + PARALUTION_LIBRARY PARALUTION_INCLUDE_DIR + )