From: maier Date: Mon, 10 Sep 2012 13:02:41 +0000 (+0000) Subject: Bugfix: Set up the Include directories at an appropriate time... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd008f354383c0f6726dc450e2c2a7c63ab97c02;p=dealii-svn.git Bugfix: Set up the Include directories at an appropriate time... git-svn-id: https://svn.dealii.org/branches/branch_cmake@26263 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/contrib/cmake/modules/prepare_umfpack.cmake b/deal.II/contrib/cmake/modules/prepare_umfpack.cmake index abbb96ea6b..d74a9630c9 100644 --- a/deal.II/contrib/cmake/modules/prepare_umfpack.cmake +++ b/deal.II/contrib/cmake/modules/prepare_umfpack.cmake @@ -6,14 +6,14 @@ IF(DEAL_II_USE_CONTRIB) # Add umfpack and amd directly to the object files of deal.II # - ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/contrib/umfpack/UMFPACK/Source) - ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/contrib/umfpack/AMD/Source) - INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/contrib/umfpack/UMFPACK/Include ${CMAKE_SOURCE_DIR}/contrib/umfpack/AMD/Include ) + ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/contrib/umfpack/UMFPACK/Source) + ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/contrib/umfpack/AMD/Source) + LIST(APPEND deal_ii_additional_object_files ${obj_umfpack_object_files} $ diff --git a/deal.II/contrib/umfpack/UMFPACK/Source/umf_internal.h b/deal.II/contrib/umfpack/UMFPACK/Source/umf_internal.h index cd46b03298..2935299e5d 100644 --- a/deal.II/contrib/umfpack/UMFPACK/Source/umf_internal.h +++ b/deal.II/contrib/umfpack/UMFPACK/Source/umf_internal.h @@ -14,7 +14,6 @@ routine names all start with the letters "umfpack_". Non-user-accessible file names and routine names all start with "umf_". */ - #ifndef _UMF_INTERNAL #define _UMF_INTERNAL @@ -120,6 +119,7 @@ #include "umfpack.h" + /* -------------------------------------------------------------------------- */ /* for contents of Info. This must correlate with umfpack.h */ /* -------------------------------------------------------------------------- */